diff --git a/analysis_options.yaml b/analysis_options.yaml
index 7bccbde1..0f19680f 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -11,6 +11,7 @@ analyzer:
     # in this file.
     included_file_warning: ignore
   exclude:
+    - build/**
     # exclude all the generated files
     - packages/*/lib/**/*.*.dart
     - packages/stream_feeds/lib/src/generated/**
diff --git a/docs/analysis_options.yaml b/docs/analysis_options.yaml
index 038e843c..60217f8a 100644
--- a/docs/analysis_options.yaml
+++ b/docs/analysis_options.yaml
@@ -1,6 +1,8 @@
 include: ../analysis_options.yaml
 
 analyzer:
+  exclude:
+    - build/**
   errors:
     unused_local_variable: ignore
 
diff --git a/packages/stream_feeds/example/analysis_options.yaml b/packages/stream_feeds/example/analysis_options.yaml
index f9b30346..033e2261 100644
--- a/packages/stream_feeds/example/analysis_options.yaml
+++ b/packages/stream_feeds/example/analysis_options.yaml
@@ -1 +1,5 @@
 include: package:flutter_lints/flutter.yaml
+
+analyzer:
+  exclude:
+    - build/**
diff --git a/packages/stream_feeds/lib/src/generated/api/model/action_log_response.dart b/packages/stream_feeds/lib/src/generated/api/model/action_log_response.dart
index 8ea86b76..992f973d 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/action_log_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/action_log_response.dart
@@ -33,6 +33,7 @@ class ActionLogResponse with _$ActionLogResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> aiProviders;
 
   @override
@@ -40,6 +41,7 @@ class ActionLogResponse with _$ActionLogResponse {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/action_log_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/action_log_response.g.dart
index dbb7e0a7..e789552d 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/action_log_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/action_log_response.g.dart
@@ -7,11 +7,11 @@ part of 'action_log_response.dart';
 // **************************************************************************
 
 ActionLogResponse _$ActionLogResponseFromJson(Map<String, dynamic> json) => ActionLogResponse(
-  aiProviders: (json['ai_providers'] as List<dynamic>).map((e) => e as String).toList(),
+  aiProviders: (json['ai_providers'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   id: json['id'] as String,
   reason: json['reason'] as String,
   reporterType: json['reporter_type'] as String,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_added_event.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_added_event.dart
index 4f03f0fc..23064e7f 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_added_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_added_event.dart
@@ -36,6 +36,7 @@ class ActivityAddedEvent extends core.WsEvent with _$ActivityAddedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_added_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_added_event.g.dart
index 8cf6d4bb..cfbe445c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_added_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_added_event.g.dart
@@ -11,12 +11,12 @@ ActivityAddedEvent _$ActivityAddedEventFromJson(
 ) => ActivityAddedEvent(
   activity: ActivityResponse.fromJson(json['activity'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -30,7 +30,7 @@ Map<String, dynamic> _$ActivityAddedEventToJson(ActivityAddedEvent instance) =>
   'custom': instance.custom,
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_deleted_event.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_deleted_event.dart
index 7cb54918..002874a1 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_deleted_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_deleted_event.dart
@@ -36,6 +36,7 @@ class ActivityDeletedEvent extends core.WsEvent with _$ActivityDeletedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_deleted_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_deleted_event.g.dart
index 3b4fd016..2c30b9df 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_deleted_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_deleted_event.g.dart
@@ -11,12 +11,12 @@ ActivityDeletedEvent _$ActivityDeletedEventFromJson(
 ) => ActivityDeletedEvent(
   activity: ActivityResponse.fromJson(json['activity'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -32,7 +32,7 @@ Map<String, dynamic> _$ActivityDeletedEventToJson(
   'custom': instance.custom,
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_feedback_event.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_feedback_event.dart
index 46121e1d..5222311d 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_feedback_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_feedback_event.dart
@@ -34,6 +34,7 @@ class ActivityFeedbackEvent extends core.WsEvent with _$ActivityFeedbackEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_feedback_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_feedback_event.g.dart
index f8a7d62b..22321787 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_feedback_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_feedback_event.g.dart
@@ -13,10 +13,10 @@ ActivityFeedbackEvent _$ActivityFeedbackEventFromJson(
     json['activity_feedback'] as Map<String, dynamic>,
   ),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -30,7 +30,7 @@ Map<String, dynamic> _$ActivityFeedbackEventToJson(
   'activity_feedback': instance.activityFeedback.toJson(),
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_feedback_event_payload.g.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_feedback_event_payload.g.dart
index 77dc311f..b6493e5d 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_feedback_event_payload.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_feedback_event_payload.g.dart
@@ -16,10 +16,10 @@ ActivityFeedbackEventPayload _$ActivityFeedbackEventPayloadFromJson(
   ),
   activityId: json['activity_id'] as String,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: UserResponse.fromJson(json['user'] as Map<String, dynamic>),
   value: json['value'] as String,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_mark_event.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_mark_event.dart
index 17c3621c..aaf9da64 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_mark_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_mark_event.dart
@@ -37,6 +37,7 @@ class ActivityMarkEvent extends core.WsEvent with _$ActivityMarkEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_mark_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_mark_event.g.dart
index 32f87122..7a53341d 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_mark_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_mark_event.g.dart
@@ -8,9 +8,9 @@ part of 'activity_mark_event.dart';
 
 ActivityMarkEvent _$ActivityMarkEventFromJson(Map<String, dynamic> json) => ActivityMarkEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   markAllRead: json['mark_all_read'] as bool?,
@@ -18,7 +18,7 @@ ActivityMarkEvent _$ActivityMarkEventFromJson(Map<String, dynamic> json) => Acti
   markRead: (json['mark_read'] as List<dynamic>?)?.map((e) => e as String).toList(),
   markSeen: (json['mark_seen'] as List<dynamic>?)?.map((e) => e as String).toList(),
   markWatched: (json['mark_watched'] as List<dynamic>?)?.map((e) => e as String).toList(),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -40,7 +40,7 @@ Map<String, dynamic> _$ActivityMarkEventToJson(ActivityMarkEvent instance) => <S
   'mark_read': instance.markRead,
   'mark_seen': instance.markSeen,
   'mark_watched': instance.markWatched,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_pin_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_pin_response.g.dart
index c8a37051..690cd094 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_pin_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_pin_response.g.dart
@@ -11,11 +11,11 @@ ActivityPinResponse _$ActivityPinResponseFromJson(Map<String, dynamic> json) =>
     json['activity'] as Map<String, dynamic>,
   ),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   feed: json['feed'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: UserResponse.fromJson(json['user'] as Map<String, dynamic>),
 );
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_pinned_event.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_pinned_event.dart
index 2c0bd08b..77b196f0 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_pinned_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_pinned_event.dart
@@ -33,6 +33,7 @@ class ActivityPinnedEvent extends core.WsEvent with _$ActivityPinnedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_pinned_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_pinned_event.g.dart
index 76833f01..74bcf1e9 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_pinned_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_pinned_event.g.dart
@@ -8,15 +8,15 @@ part of 'activity_pinned_event.dart';
 
 ActivityPinnedEvent _$ActivityPinnedEventFromJson(Map<String, dynamic> json) => ActivityPinnedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   pinnedActivity: PinActivityResponse.fromJson(
     json['pinned_activity'] as Map<String, dynamic>,
   ),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -36,7 +36,7 @@ Map<String, dynamic> _$ActivityPinnedEventToJson(
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'pinned_activity': instance.pinnedActivity.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_added_event.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_added_event.dart
index 3c8741e3..b1bda266 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_added_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_added_event.dart
@@ -37,6 +37,7 @@ class ActivityReactionAddedEvent extends core.WsEvent with _$ActivityReactionAdd
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_added_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_added_event.g.dart
index a6524650..47974469 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_added_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_added_event.g.dart
@@ -11,15 +11,15 @@ ActivityReactionAddedEvent _$ActivityReactionAddedEventFromJson(
 ) => ActivityReactionAddedEvent(
   activity: ActivityResponse.fromJson(json['activity'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   reaction: FeedsReactionResponse.fromJson(
     json['reaction'] as Map<String, dynamic>,
   ),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -36,7 +36,7 @@ Map<String, dynamic> _$ActivityReactionAddedEventToJson(
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'reaction': instance.reaction.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_deleted_event.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_deleted_event.dart
index 940270d8..4d76ab89 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_deleted_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_deleted_event.dart
@@ -37,6 +37,7 @@ class ActivityReactionDeletedEvent extends core.WsEvent with _$ActivityReactionD
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_deleted_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_deleted_event.g.dart
index 2cd238c6..e0a35ac7 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_deleted_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_deleted_event.g.dart
@@ -11,15 +11,15 @@ ActivityReactionDeletedEvent _$ActivityReactionDeletedEventFromJson(
 ) => ActivityReactionDeletedEvent(
   activity: ActivityResponse.fromJson(json['activity'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   reaction: FeedsReactionResponse.fromJson(
     json['reaction'] as Map<String, dynamic>,
   ),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -36,7 +36,7 @@ Map<String, dynamic> _$ActivityReactionDeletedEventToJson(
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'reaction': instance.reaction.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_updated_event.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_updated_event.dart
index 7727d9d2..7dc625d5 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_updated_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_updated_event.dart
@@ -37,6 +37,7 @@ class ActivityReactionUpdatedEvent extends core.WsEvent with _$ActivityReactionU
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_updated_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_updated_event.g.dart
index 308f20f3..7a856fe8 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_updated_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_reaction_updated_event.g.dart
@@ -11,15 +11,15 @@ ActivityReactionUpdatedEvent _$ActivityReactionUpdatedEventFromJson(
 ) => ActivityReactionUpdatedEvent(
   activity: ActivityResponse.fromJson(json['activity'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   reaction: FeedsReactionResponse.fromJson(
     json['reaction'] as Map<String, dynamic>,
   ),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -36,7 +36,7 @@ Map<String, dynamic> _$ActivityReactionUpdatedEventToJson(
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'reaction': instance.reaction.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_removed_from_feed_event.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_removed_from_feed_event.dart
index 360c7baa..40a15210 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_removed_from_feed_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_removed_from_feed_event.dart
@@ -36,6 +36,7 @@ class ActivityRemovedFromFeedEvent extends core.WsEvent with _$ActivityRemovedFr
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_removed_from_feed_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_removed_from_feed_event.g.dart
index 4c29f53d..921e7577 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_removed_from_feed_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_removed_from_feed_event.g.dart
@@ -11,12 +11,12 @@ ActivityRemovedFromFeedEvent _$ActivityRemovedFromFeedEventFromJson(
 ) => ActivityRemovedFromFeedEvent(
   activity: ActivityResponse.fromJson(json['activity'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -32,7 +32,7 @@ Map<String, dynamic> _$ActivityRemovedFromFeedEventToJson(
   'custom': instance.custom,
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_request.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_request.dart
index 4bdacc73..76da5d02 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_request.dart
@@ -86,6 +86,7 @@ class ActivityRequest with _$ActivityRequest {
   final String? expiresAt;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> feeds;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_request.g.dart
index 30a7a701..65fc5a72 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_request.g.dart
@@ -15,7 +15,7 @@ ActivityRequest _$ActivityRequestFromJson(Map<String, dynamic> json) => Activity
   createNotificationActivity: json['create_notification_activity'] as bool?,
   custom: json['custom'] as Map<String, dynamic>?,
   expiresAt: json['expires_at'] as String?,
-  feeds: (json['feeds'] as List<dynamic>).map((e) => e as String).toList(),
+  feeds: (json['feeds'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   filterTags: (json['filter_tags'] as List<dynamic>?)?.map((e) => e as String).toList(),
   id: json['id'] as String?,
   interestTags: (json['interest_tags'] as List<dynamic>?)?.map((e) => e as String).toList(),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_response.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_response.dart
index 00633e95..0e1ef193 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_response.dart
@@ -93,18 +93,21 @@ class ActivityResponse with _$ActivityResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<Attachment> attachments;
 
   @override
   final int bookmarkCount;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, EnrichedCollectionResponse> collections;
 
   @override
   final int commentCount;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<CommentResponse> comments;
 
   @override
@@ -115,6 +118,7 @@ class ActivityResponse with _$ActivityResponse {
   final FeedResponse? currentFeed;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
@@ -130,9 +134,11 @@ class ActivityResponse with _$ActivityResponse {
   final DateTime? expiresAt;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> feeds;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> filterTags;
 
   @override
@@ -148,6 +154,7 @@ class ActivityResponse with _$ActivityResponse {
   final String id;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> interestTags;
 
   @override
@@ -160,12 +167,14 @@ class ActivityResponse with _$ActivityResponse {
   final bool? isWatched;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedsReactionResponse> latestReactions;
 
   @override
   final Location? location;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<UserResponse> mentionedUsers;
 
   @override
@@ -181,9 +190,11 @@ class ActivityResponse with _$ActivityResponse {
   final NotificationContext? notificationContext;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<BookmarkResponse> ownBookmarks;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedsReactionResponse> ownReactions;
 
   @override
@@ -202,6 +213,7 @@ class ActivityResponse with _$ActivityResponse {
   final int reactionCount;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, FeedsReactionGroupResponse> reactionGroups;
 
   @override
@@ -215,6 +227,7 @@ class ActivityResponse with _$ActivityResponse {
   final Map<String, Object?>? scoreVars;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> searchData;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_response.g.dart
index 01598d65..3a92b5f4 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_response.g.dart
@@ -6,61 +6,69 @@ part of 'activity_response.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-ActivityResponse _$ActivityResponseFromJson(Map<String, dynamic> json) => ActivityResponse(
-  attachments: (json['attachments'] as List<dynamic>)
-      .map((e) => Attachment.fromJson(e as Map<String, dynamic>))
-      .toList(),
+ActivityResponse _$ActivityResponseFromJson(
+  Map<String, dynamic> json,
+) => ActivityResponse(
+  attachments:
+      (json['attachments'] as List<dynamic>?)?.map((e) => Attachment.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   bookmarkCount: (json['bookmark_count'] as num).toInt(),
-  collections: (json['collections'] as Map<String, dynamic>).map(
-    (k, e) => MapEntry(
-      k,
-      EnrichedCollectionResponse.fromJson(e as Map<String, dynamic>),
-    ),
-  ),
+  collections:
+      (json['collections'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          k,
+          EnrichedCollectionResponse.fromJson(e as Map<String, dynamic>),
+        ),
+      ) ??
+      {},
   commentCount: (json['comment_count'] as num).toInt(),
-  comments: (json['comments'] as List<dynamic>)
-      .map((e) => CommentResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  comments:
+      (json['comments'] as List<dynamic>?)?.map((e) => CommentResponse.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   currentFeed: json['current_feed'] == null
       ? null
       : FeedResponse.fromJson(json['current_feed'] as Map<String, dynamic>),
-  custom: json['custom'] as Map<String, dynamic>,
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  editedAt: _$JsonConverterFromJson<int, DateTime>(
+  editedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['edited_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  expiresAt: _$JsonConverterFromJson<int, DateTime>(
+  expiresAt: _$JsonConverterFromJson<Object, DateTime>(
     json['expires_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  feeds: (json['feeds'] as List<dynamic>).map((e) => e as String).toList(),
-  filterTags: (json['filter_tags'] as List<dynamic>).map((e) => e as String).toList(),
+  feeds: (json['feeds'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
+  filterTags: (json['filter_tags'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   friendReactionCount: (json['friend_reaction_count'] as num?)?.toInt(),
   friendReactions: (json['friend_reactions'] as List<dynamic>?)
-      ?.map(
-        (e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>),
-      )
+      ?.map((e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>))
       .toList(),
   hidden: json['hidden'] as bool,
   id: json['id'] as String,
-  interestTags: (json['interest_tags'] as List<dynamic>).map((e) => e as String).toList(),
+  interestTags: (json['interest_tags'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   isRead: json['is_read'] as bool?,
   isSeen: json['is_seen'] as bool?,
   isWatched: json['is_watched'] as bool?,
-  latestReactions: (json['latest_reactions'] as List<dynamic>)
-      .map((e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  latestReactions:
+      (json['latest_reactions'] as List<dynamic>?)
+          ?.map(
+            (e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
   location: json['location'] == null ? null : Location.fromJson(json['location'] as Map<String, dynamic>),
-  mentionedUsers: (json['mentioned_users'] as List<dynamic>)
-      .map((e) => UserResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  mentionedUsers:
+      (json['mentioned_users'] as List<dynamic>?)
+          ?.map((e) => UserResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   metrics: (json['metrics'] as Map<String, dynamic>?)?.map(
     (k, e) => MapEntry(k, (e as num).toInt()),
   ),
@@ -75,23 +83,31 @@ ActivityResponse _$ActivityResponseFromJson(Map<String, dynamic> json) => Activi
       : NotificationContext.fromJson(
           json['notification_context'] as Map<String, dynamic>,
         ),
-  ownBookmarks: (json['own_bookmarks'] as List<dynamic>)
-      .map((e) => BookmarkResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
-  ownReactions: (json['own_reactions'] as List<dynamic>)
-      .map((e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  ownBookmarks:
+      (json['own_bookmarks'] as List<dynamic>?)
+          ?.map((e) => BookmarkResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
+  ownReactions:
+      (json['own_reactions'] as List<dynamic>?)
+          ?.map(
+            (e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
   parent: json['parent'] == null ? null : ActivityResponse.fromJson(json['parent'] as Map<String, dynamic>),
   poll: json['poll'] == null ? null : PollResponseData.fromJson(json['poll'] as Map<String, dynamic>),
   popularity: (json['popularity'] as num).toInt(),
   preview: json['preview'] as bool,
   reactionCount: (json['reaction_count'] as num).toInt(),
-  reactionGroups: (json['reaction_groups'] as Map<String, dynamic>).map(
-    (k, e) => MapEntry(
-      k,
-      FeedsReactionGroupResponse.fromJson(e as Map<String, dynamic>),
-    ),
-  ),
+  reactionGroups:
+      (json['reaction_groups'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          k,
+          FeedsReactionGroupResponse.fromJson(e as Map<String, dynamic>),
+        ),
+      ) ??
+      {},
   restrictReplies: $enumDecode(
     _$ActivityResponseRestrictRepliesEnumMap,
     json['restrict_replies'],
@@ -99,13 +115,13 @@ ActivityResponse _$ActivityResponseFromJson(Map<String, dynamic> json) => Activi
   ),
   score: (json['score'] as num).toDouble(),
   scoreVars: json['score_vars'] as Map<String, dynamic>?,
-  searchData: json['search_data'] as Map<String, dynamic>,
+  searchData: json['search_data'] as Map<String, dynamic>? ?? {},
   selectorSource: json['selector_source'] as String?,
   shareCount: (json['share_count'] as num).toInt(),
   text: json['text'] as String?,
   type: json['type'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: UserResponse.fromJson(json['user'] as Map<String, dynamic>),
   visibility: $enumDecode(
@@ -127,15 +143,15 @@ Map<String, dynamic> _$ActivityResponseToJson(
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'current_feed': instance.currentFeed?.toJson(),
   'custom': instance.custom,
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
-  'edited_at': _$JsonConverterToJson<int, DateTime>(
+  'edited_at': _$JsonConverterToJson<Object, DateTime>(
     instance.editedAt,
     const EpochDateTimeConverter().toJson,
   ),
-  'expires_at': _$JsonConverterToJson<int, DateTime>(
+  'expires_at': _$JsonConverterToJson<Object, DateTime>(
     instance.expiresAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_restored_event.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_restored_event.dart
index ff210529..ad82a7c8 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_restored_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_restored_event.dart
@@ -36,6 +36,7 @@ class ActivityRestoredEvent extends core.WsEvent with _$ActivityRestoredEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_restored_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_restored_event.g.dart
index a0b26667..7cb7465c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_restored_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_restored_event.g.dart
@@ -11,12 +11,12 @@ ActivityRestoredEvent _$ActivityRestoredEventFromJson(
 ) => ActivityRestoredEvent(
   activity: ActivityResponse.fromJson(json['activity'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -32,7 +32,7 @@ Map<String, dynamic> _$ActivityRestoredEventToJson(
   'custom': instance.custom,
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_selector_config.g.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_selector_config.g.dart
index 186ab7ff..26f529b0 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_selector_config.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_selector_config.g.dart
@@ -10,7 +10,7 @@ ActivitySelectorConfig _$ActivitySelectorConfigFromJson(
   Map<String, dynamic> json,
 ) => ActivitySelectorConfig(
   cutoffTime: const EpochDateTimeConverter().fromJson(
-    (json['cutoff_time'] as num).toInt(),
+    json['cutoff_time'] as Object,
   ),
   cutoffWindow: json['cutoff_window'] as String?,
   filter: json['filter'] as Map<String, dynamic>?,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_unpinned_event.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_unpinned_event.dart
index 8f327607..7df177c3 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_unpinned_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_unpinned_event.dart
@@ -33,6 +33,7 @@ class ActivityUnpinnedEvent extends core.WsEvent with _$ActivityUnpinnedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_unpinned_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_unpinned_event.g.dart
index f7b17aba..022448b2 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_unpinned_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_unpinned_event.g.dart
@@ -10,15 +10,15 @@ ActivityUnpinnedEvent _$ActivityUnpinnedEventFromJson(
   Map<String, dynamic> json,
 ) => ActivityUnpinnedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   pinnedActivity: PinActivityResponse.fromJson(
     json['pinned_activity'] as Map<String, dynamic>,
   ),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -34,7 +34,7 @@ Map<String, dynamic> _$ActivityUnpinnedEventToJson(
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'pinned_activity': instance.pinnedActivity.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_updated_event.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_updated_event.dart
index 089881d4..06458d1d 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_updated_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_updated_event.dart
@@ -36,6 +36,7 @@ class ActivityUpdatedEvent extends core.WsEvent with _$ActivityUpdatedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/activity_updated_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/activity_updated_event.g.dart
index 8b677d4d..f19827f6 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/activity_updated_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/activity_updated_event.g.dart
@@ -11,12 +11,12 @@ ActivityUpdatedEvent _$ActivityUpdatedEventFromJson(
 ) => ActivityUpdatedEvent(
   activity: ActivityResponse.fromJson(json['activity'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -32,7 +32,7 @@ Map<String, dynamic> _$ActivityUpdatedEventToJson(
   'custom': instance.custom,
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/add_activity_request.dart b/packages/stream_feeds/lib/src/generated/api/model/add_activity_request.dart
index 83f9c810..e45be3fe 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/add_activity_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/add_activity_request.dart
@@ -90,6 +90,7 @@ class AddActivityRequest with _$AddActivityRequest {
   final String? expiresAt;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> feeds;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/add_activity_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/add_activity_request.g.dart
index 31177076..b4e47213 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/add_activity_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/add_activity_request.g.dart
@@ -16,7 +16,7 @@ AddActivityRequest _$AddActivityRequestFromJson(Map<String, dynamic> json) => Ad
   custom: json['custom'] as Map<String, dynamic>?,
   enrichOwnFields: json['enrich_own_fields'] as bool?,
   expiresAt: json['expires_at'] as String?,
-  feeds: (json['feeds'] as List<dynamic>).map((e) => e as String).toList(),
+  feeds: (json['feeds'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   filterTags: (json['filter_tags'] as List<dynamic>?)?.map((e) => e as String).toList(),
   id: json['id'] as String?,
   interestTags: (json['interest_tags'] as List<dynamic>?)?.map((e) => e as String).toList(),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/add_comments_batch_request.dart b/packages/stream_feeds/lib/src/generated/api/model/add_comments_batch_request.dart
index 583ea575..e84352da 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/add_comments_batch_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/add_comments_batch_request.dart
@@ -22,6 +22,7 @@ class AddCommentsBatchRequest with _$AddCommentsBatchRequest {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<AddCommentRequest> comments;
 
   Map<String, dynamic> toJson() => _$AddCommentsBatchRequestToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/add_comments_batch_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/add_comments_batch_request.g.dart
index 3f4504c7..e3d9f280 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/add_comments_batch_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/add_comments_batch_request.g.dart
@@ -9,9 +9,11 @@ part of 'add_comments_batch_request.dart';
 AddCommentsBatchRequest _$AddCommentsBatchRequestFromJson(
   Map<String, dynamic> json,
 ) => AddCommentsBatchRequest(
-  comments: (json['comments'] as List<dynamic>)
-      .map((e) => AddCommentRequest.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  comments:
+      (json['comments'] as List<dynamic>?)
+          ?.map((e) => AddCommentRequest.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$AddCommentsBatchRequestToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/add_comments_batch_response.dart b/packages/stream_feeds/lib/src/generated/api/model/add_comments_batch_response.dart
index 693a1f38..cbb18868 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/add_comments_batch_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/add_comments_batch_response.dart
@@ -23,6 +23,7 @@ class AddCommentsBatchResponse with _$AddCommentsBatchResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<CommentResponse> comments;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/add_comments_batch_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/add_comments_batch_response.g.dart
index 848133da..37d040c0 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/add_comments_batch_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/add_comments_batch_response.g.dart
@@ -9,9 +9,9 @@ part of 'add_comments_batch_response.dart';
 AddCommentsBatchResponse _$AddCommentsBatchResponseFromJson(
   Map<String, dynamic> json,
 ) => AddCommentsBatchResponse(
-  comments: (json['comments'] as List<dynamic>)
-      .map((e) => CommentResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  comments:
+      (json['comments'] as List<dynamic>?)?.map((e) => CommentResponse.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   duration: json['duration'] as String,
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/add_user_group_members_request.dart b/packages/stream_feeds/lib/src/generated/api/model/add_user_group_members_request.dart
index 2b5180f8..c101a5d6 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/add_user_group_members_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/add_user_group_members_request.dart
@@ -27,6 +27,7 @@ class AddUserGroupMembersRequest with _$AddUserGroupMembersRequest {
   final bool? asAdmin;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> memberIds;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/add_user_group_members_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/add_user_group_members_request.g.dart
index 83be20cd..51b6c97c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/add_user_group_members_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/add_user_group_members_request.g.dart
@@ -10,7 +10,7 @@ AddUserGroupMembersRequest _$AddUserGroupMembersRequestFromJson(
   Map<String, dynamic> json,
 ) => AddUserGroupMembersRequest(
   asAdmin: json['as_admin'] as bool?,
-  memberIds: (json['member_ids'] as List<dynamic>).map((e) => e as String).toList(),
+  memberIds: (json['member_ids'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   teamId: json['team_id'] as String?,
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/aggregated_activity_response.dart b/packages/stream_feeds/lib/src/generated/api/model/aggregated_activity_response.dart
index 4d4bbe9b..39d643cf 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/aggregated_activity_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/aggregated_activity_response.dart
@@ -32,6 +32,7 @@ class AggregatedActivityResponse with _$AggregatedActivityResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ActivityResponse> activities;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/aggregated_activity_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/aggregated_activity_response.g.dart
index 3c6c5d9a..2266af4d 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/aggregated_activity_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/aggregated_activity_response.g.dart
@@ -9,12 +9,14 @@ part of 'aggregated_activity_response.dart';
 AggregatedActivityResponse _$AggregatedActivityResponseFromJson(
   Map<String, dynamic> json,
 ) => AggregatedActivityResponse(
-  activities: (json['activities'] as List<dynamic>)
-      .map((e) => ActivityResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  activities:
+      (json['activities'] as List<dynamic>?)
+          ?.map((e) => ActivityResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   activityCount: (json['activity_count'] as num).toInt(),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   group: json['group'] as String,
   isRead: json['is_read'] as bool?,
@@ -22,7 +24,7 @@ AggregatedActivityResponse _$AggregatedActivityResponseFromJson(
   isWatched: json['is_watched'] as bool?,
   score: (json['score'] as num).toDouble(),
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   userCount: (json['user_count'] as num).toInt(),
   userCountTruncated: json['user_count_truncated'] as bool,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/ai_image_config.dart b/packages/stream_feeds/lib/src/generated/api/model/ai_image_config.dart
index 431591de..41633592 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/ai_image_config.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/ai_image_config.dart
@@ -31,9 +31,11 @@ class AIImageConfig with _$AIImageConfig {
   final bool enabled;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<OCRRule> ocrRules;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<AWSRekognitionRule> rules;
 
   Map<String, dynamic> toJson() => _$AIImageConfigToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/ai_image_config.g.dart b/packages/stream_feeds/lib/src/generated/api/model/ai_image_config.g.dart
index 14f032da..94df17a4 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/ai_image_config.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/ai_image_config.g.dart
@@ -9,8 +9,15 @@ part of 'ai_image_config.dart';
 AIImageConfig _$AIImageConfigFromJson(Map<String, dynamic> json) => AIImageConfig(
   async: json['async'] as bool?,
   enabled: json['enabled'] as bool,
-  ocrRules: (json['ocr_rules'] as List<dynamic>).map((e) => OCRRule.fromJson(e as Map<String, dynamic>)).toList(),
-  rules: (json['rules'] as List<dynamic>).map((e) => AWSRekognitionRule.fromJson(e as Map<String, dynamic>)).toList(),
+  ocrRules:
+      (json['ocr_rules'] as List<dynamic>?)?.map((e) => OCRRule.fromJson(e as Map<String, dynamic>)).toList() ?? [],
+  rules:
+      (json['rules'] as List<dynamic>?)
+          ?.map(
+            (e) => AWSRekognitionRule.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$AIImageConfigToJson(AIImageConfig instance) => <String, dynamic>{
diff --git a/packages/stream_feeds/lib/src/generated/api/model/ai_text_config.dart b/packages/stream_feeds/lib/src/generated/api/model/ai_text_config.dart
index a46a82bc..9434cbc1 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/ai_text_config.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/ai_text_config.dart
@@ -35,9 +35,11 @@ class AITextConfig with _$AITextConfig {
   final String profile;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<BodyguardRule> rules;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<BodyguardSeverityRule> severityRules;
 
   Map<String, dynamic> toJson() => _$AITextConfigToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/ai_text_config.g.dart b/packages/stream_feeds/lib/src/generated/api/model/ai_text_config.g.dart
index 91e9e0b9..f57c1d9e 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/ai_text_config.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/ai_text_config.g.dart
@@ -10,10 +10,15 @@ AITextConfig _$AITextConfigFromJson(Map<String, dynamic> json) => AITextConfig(
   async: json['async'] as bool?,
   enabled: json['enabled'] as bool,
   profile: json['profile'] as String,
-  rules: (json['rules'] as List<dynamic>).map((e) => BodyguardRule.fromJson(e as Map<String, dynamic>)).toList(),
-  severityRules: (json['severity_rules'] as List<dynamic>)
-      .map((e) => BodyguardSeverityRule.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  rules:
+      (json['rules'] as List<dynamic>?)?.map((e) => BodyguardRule.fromJson(e as Map<String, dynamic>)).toList() ?? [],
+  severityRules:
+      (json['severity_rules'] as List<dynamic>?)
+          ?.map(
+            (e) => BodyguardSeverityRule.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$AITextConfigToJson(AITextConfig instance) => <String, dynamic>{
diff --git a/packages/stream_feeds/lib/src/generated/api/model/ai_video_config.dart b/packages/stream_feeds/lib/src/generated/api/model/ai_video_config.dart
index a17de92a..ce5e939f 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/ai_video_config.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/ai_video_config.dart
@@ -30,6 +30,7 @@ class AIVideoConfig with _$AIVideoConfig {
   final bool enabled;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<AWSRekognitionRule> rules;
 
   Map<String, dynamic> toJson() => _$AIVideoConfigToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/ai_video_config.g.dart b/packages/stream_feeds/lib/src/generated/api/model/ai_video_config.g.dart
index 54b166bb..994a6ffa 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/ai_video_config.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/ai_video_config.g.dart
@@ -9,7 +9,13 @@ part of 'ai_video_config.dart';
 AIVideoConfig _$AIVideoConfigFromJson(Map<String, dynamic> json) => AIVideoConfig(
   async: json['async'] as bool?,
   enabled: json['enabled'] as bool,
-  rules: (json['rules'] as List<dynamic>).map((e) => AWSRekognitionRule.fromJson(e as Map<String, dynamic>)).toList(),
+  rules:
+      (json['rules'] as List<dynamic>?)
+          ?.map(
+            (e) => AWSRekognitionRule.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$AIVideoConfigToJson(AIVideoConfig instance) => <String, dynamic>{
diff --git a/packages/stream_feeds/lib/src/generated/api/model/app_updated_event.dart b/packages/stream_feeds/lib/src/generated/api/model/app_updated_event.dart
index 7f6dfd8d..c06a39bb 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/app_updated_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/app_updated_event.dart
@@ -33,6 +33,7 @@ class AppUpdatedEvent extends core.WsEvent with _$AppUpdatedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/app_updated_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/app_updated_event.g.dart
index 7b8bf1d2..bd26eb09 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/app_updated_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/app_updated_event.g.dart
@@ -9,10 +9,10 @@ part of 'app_updated_event.dart';
 AppUpdatedEvent _$AppUpdatedEventFromJson(Map<String, dynamic> json) => AppUpdatedEvent(
   app: AppEventResponse.fromJson(json['app'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -23,7 +23,7 @@ Map<String, dynamic> _$AppUpdatedEventToJson(AppUpdatedEvent instance) => <Strin
   'app': instance.app.toJson(),
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/appeal_item_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/appeal_item_response.g.dart
index 2285c5c2..8834b055 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/appeal_item_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/appeal_item_response.g.dart
@@ -16,7 +16,7 @@ AppealItemResponse _$AppealItemResponseFromJson(Map<String, dynamic> json) => Ap
   channelCid: json['channel_cid'] as String?,
   configKey: json['config_key'] as String?,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   decisionReason: json['decision_reason'] as String?,
   entityContent: json['entity_content'] == null
@@ -49,7 +49,7 @@ AppealItemResponse _$AppealItemResponseFromJson(Map<String, dynamic> json) => Ap
   severity: (json['severity'] as num?)?.toInt(),
   status: json['status'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: json['user'] == null ? null : UserResponse.fromJson(json['user'] as Map<String, dynamic>),
 );
diff --git a/packages/stream_feeds/lib/src/generated/api/model/attachment.dart b/packages/stream_feeds/lib/src/generated/api/model/attachment.dart
index b96fa44a..e42eb8e7 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/attachment.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/attachment.dart
@@ -61,6 +61,7 @@ class Attachment with _$Attachment {
   final String? color;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/attachment.g.dart b/packages/stream_feeds/lib/src/generated/api/model/attachment.g.dart
index 1643be68..0bf07d76 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/attachment.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/attachment.g.dart
@@ -13,7 +13,7 @@ Attachment _$AttachmentFromJson(Map<String, dynamic> json) => Attachment(
   authorLink: json['author_link'] as String?,
   authorName: json['author_name'] as String?,
   color: json['color'] as String?,
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   fallback: json['fallback'] as String?,
   fields: (json['fields'] as List<dynamic>?)?.map((e) => Field.fromJson(e as Map<String, dynamic>)).toList(),
   footer: json['footer'] as String?,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/automod_platform_circumvention_config.dart b/packages/stream_feeds/lib/src/generated/api/model/automod_platform_circumvention_config.dart
index a7dd0fb8..20219a1a 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/automod_platform_circumvention_config.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/automod_platform_circumvention_config.dart
@@ -30,6 +30,7 @@ class AutomodPlatformCircumventionConfig with _$AutomodPlatformCircumventionConf
   final bool enabled;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<AutomodRule> rules;
 
   Map<String, dynamic> toJson() => _$AutomodPlatformCircumventionConfigToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/automod_platform_circumvention_config.g.dart b/packages/stream_feeds/lib/src/generated/api/model/automod_platform_circumvention_config.g.dart
index 9a94077f..021fc179 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/automod_platform_circumvention_config.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/automod_platform_circumvention_config.g.dart
@@ -11,7 +11,7 @@ AutomodPlatformCircumventionConfig _$AutomodPlatformCircumventionConfigFromJson(
 ) => AutomodPlatformCircumventionConfig(
   async: json['async'] as bool?,
   enabled: json['enabled'] as bool,
-  rules: (json['rules'] as List<dynamic>).map((e) => AutomodRule.fromJson(e as Map<String, dynamic>)).toList(),
+  rules: (json['rules'] as List<dynamic>?)?.map((e) => AutomodRule.fromJson(e as Map<String, dynamic>)).toList() ?? [],
 );
 
 Map<String, dynamic> _$AutomodPlatformCircumventionConfigToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/automod_semantic_filters_config.dart b/packages/stream_feeds/lib/src/generated/api/model/automod_semantic_filters_config.dart
index b53c0115..1111c3d1 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/automod_semantic_filters_config.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/automod_semantic_filters_config.dart
@@ -30,6 +30,7 @@ class AutomodSemanticFiltersConfig with _$AutomodSemanticFiltersConfig {
   final bool enabled;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<AutomodSemanticFiltersRule> rules;
 
   Map<String, dynamic> toJson() => _$AutomodSemanticFiltersConfigToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/automod_semantic_filters_config.g.dart b/packages/stream_feeds/lib/src/generated/api/model/automod_semantic_filters_config.g.dart
index 514f8e26..0e930c17 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/automod_semantic_filters_config.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/automod_semantic_filters_config.g.dart
@@ -11,11 +11,13 @@ AutomodSemanticFiltersConfig _$AutomodSemanticFiltersConfigFromJson(
 ) => AutomodSemanticFiltersConfig(
   async: json['async'] as bool?,
   enabled: json['enabled'] as bool,
-  rules: (json['rules'] as List<dynamic>)
-      .map(
-        (e) => AutomodSemanticFiltersRule.fromJson(e as Map<String, dynamic>),
-      )
-      .toList(),
+  rules:
+      (json['rules'] as List<dynamic>?)
+          ?.map(
+            (e) => AutomodSemanticFiltersRule.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$AutomodSemanticFiltersConfigToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/automod_toxicity_config.dart b/packages/stream_feeds/lib/src/generated/api/model/automod_toxicity_config.dart
index ee01e96c..e3bc3fbb 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/automod_toxicity_config.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/automod_toxicity_config.dart
@@ -30,6 +30,7 @@ class AutomodToxicityConfig with _$AutomodToxicityConfig {
   final bool enabled;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<AutomodRule> rules;
 
   Map<String, dynamic> toJson() => _$AutomodToxicityConfigToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/automod_toxicity_config.g.dart b/packages/stream_feeds/lib/src/generated/api/model/automod_toxicity_config.g.dart
index 4f7e2ad9..c006f4df 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/automod_toxicity_config.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/automod_toxicity_config.g.dart
@@ -11,7 +11,7 @@ AutomodToxicityConfig _$AutomodToxicityConfigFromJson(
 ) => AutomodToxicityConfig(
   async: json['async'] as bool?,
   enabled: json['enabled'] as bool,
-  rules: (json['rules'] as List<dynamic>).map((e) => AutomodRule.fromJson(e as Map<String, dynamic>)).toList(),
+  rules: (json['rules'] as List<dynamic>?)?.map((e) => AutomodRule.fromJson(e as Map<String, dynamic>)).toList() ?? [],
 );
 
 Map<String, dynamic> _$AutomodToxicityConfigToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/ban_info_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/ban_info_response.g.dart
index 6e3d72a4..0096a490 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/ban_info_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/ban_info_response.g.dart
@@ -8,10 +8,10 @@ part of 'ban_info_response.dart';
 
 BanInfoResponse _$BanInfoResponseFromJson(Map<String, dynamic> json) => BanInfoResponse(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   createdBy: json['created_by'] == null ? null : UserResponse.fromJson(json['created_by'] as Map<String, dynamic>),
-  expires: _$JsonConverterFromJson<int, DateTime>(
+  expires: _$JsonConverterFromJson<Object, DateTime>(
     json['expires'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -23,7 +23,7 @@ BanInfoResponse _$BanInfoResponseFromJson(Map<String, dynamic> json) => BanInfoR
 Map<String, dynamic> _$BanInfoResponseToJson(BanInfoResponse instance) => <String, dynamic>{
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'created_by': instance.createdBy?.toJson(),
-  'expires': _$JsonConverterToJson<int, DateTime>(
+  'expires': _$JsonConverterToJson<Object, DateTime>(
     instance.expires,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/block_list_config.dart b/packages/stream_feeds/lib/src/generated/api/model/block_list_config.dart
index e2645bd4..2b9c67b8 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/block_list_config.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/block_list_config.dart
@@ -34,6 +34,7 @@ class BlockListConfig with _$BlockListConfig {
   final bool? matchSubstring;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<BlockListRule> rules;
 
   Map<String, dynamic> toJson() => _$BlockListConfigToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/block_list_config.g.dart b/packages/stream_feeds/lib/src/generated/api/model/block_list_config.g.dart
index 412b4526..8f36b8ab 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/block_list_config.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/block_list_config.g.dart
@@ -10,7 +10,8 @@ BlockListConfig _$BlockListConfigFromJson(Map<String, dynamic> json) => BlockLis
   async: json['async'] as bool?,
   enabled: json['enabled'] as bool,
   matchSubstring: json['match_substring'] as bool?,
-  rules: (json['rules'] as List<dynamic>).map((e) => BlockListRule.fromJson(e as Map<String, dynamic>)).toList(),
+  rules:
+      (json['rules'] as List<dynamic>?)?.map((e) => BlockListRule.fromJson(e as Map<String, dynamic>)).toList() ?? [],
 );
 
 Map<String, dynamic> _$BlockListConfigToJson(BlockListConfig instance) => <String, dynamic>{
diff --git a/packages/stream_feeds/lib/src/generated/api/model/block_list_response.dart b/packages/stream_feeds/lib/src/generated/api/model/block_list_response.dart
index bac65aa5..88b89c35 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/block_list_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/block_list_response.dart
@@ -56,6 +56,7 @@ class BlockListResponse with _$BlockListResponse {
   final DateTime? updatedAt;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> words;
 
   Map<String, dynamic> toJson() => _$BlockListResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/block_list_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/block_list_response.g.dart
index e59c8eea..fc9c82ee 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/block_list_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/block_list_response.g.dart
@@ -7,7 +7,7 @@ part of 'block_list_response.dart';
 // **************************************************************************
 
 BlockListResponse _$BlockListResponseFromJson(Map<String, dynamic> json) => BlockListResponse(
-  createdAt: _$JsonConverterFromJson<int, DateTime>(
+  createdAt: _$JsonConverterFromJson<Object, DateTime>(
     json['created_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -17,15 +17,15 @@ BlockListResponse _$BlockListResponseFromJson(Map<String, dynamic> json) => Bloc
   name: json['name'] as String,
   team: json['team'] as String?,
   type: json['type'] as String,
-  updatedAt: _$JsonConverterFromJson<int, DateTime>(
+  updatedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['updated_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  words: (json['words'] as List<dynamic>).map((e) => e as String).toList(),
+  words: (json['words'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
 );
 
 Map<String, dynamic> _$BlockListResponseToJson(BlockListResponse instance) => <String, dynamic>{
-  'created_at': _$JsonConverterToJson<int, DateTime>(
+  'created_at': _$JsonConverterToJson<Object, DateTime>(
     instance.createdAt,
     const EpochDateTimeConverter().toJson,
   ),
@@ -35,7 +35,7 @@ Map<String, dynamic> _$BlockListResponseToJson(BlockListResponse instance) => <S
   'name': instance.name,
   'team': instance.team,
   'type': instance.type,
-  'updated_at': _$JsonConverterToJson<int, DateTime>(
+  'updated_at': _$JsonConverterToJson<Object, DateTime>(
     instance.updatedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/block_users_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/block_users_response.g.dart
index 53eca260..f5f7a761 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/block_users_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/block_users_response.g.dart
@@ -10,7 +10,7 @@ BlockUsersResponse _$BlockUsersResponseFromJson(Map<String, dynamic> json) => Bl
   blockedByUserId: json['blocked_by_user_id'] as String,
   blockedUserId: json['blocked_user_id'] as String,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   duration: json['duration'] as String,
 );
diff --git a/packages/stream_feeds/lib/src/generated/api/model/blocked_user_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/blocked_user_response.g.dart
index 657042aa..09566edc 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/blocked_user_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/blocked_user_response.g.dart
@@ -12,7 +12,7 @@ BlockedUserResponse _$BlockedUserResponseFromJson(Map<String, dynamic> json) =>
   ),
   blockedUserId: json['blocked_user_id'] as String,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   user: UserResponse.fromJson(json['user'] as Map<String, dynamic>),
   userId: json['user_id'] as String,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bodyguard_rule.dart b/packages/stream_feeds/lib/src/generated/api/model/bodyguard_rule.dart
index 064c86ef..188b3ff6 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bodyguard_rule.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bodyguard_rule.dart
@@ -55,6 +55,7 @@ class BodyguardRule with _$BodyguardRule {
   final String label;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<BodyguardSeverityRule> severityRules;
 
   Map<String, dynamic> toJson() => _$BodyguardRuleToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bodyguard_rule.g.dart b/packages/stream_feeds/lib/src/generated/api/model/bodyguard_rule.g.dart
index dfcfaa33..d4362d92 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bodyguard_rule.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bodyguard_rule.g.dart
@@ -13,9 +13,13 @@ BodyguardRule _$BodyguardRuleFromJson(Map<String, dynamic> json) => BodyguardRul
     unknownValue: BodyguardRuleAction.unknown,
   ),
   label: json['label'] as String,
-  severityRules: (json['severity_rules'] as List<dynamic>)
-      .map((e) => BodyguardSeverityRule.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  severityRules:
+      (json['severity_rules'] as List<dynamic>?)
+          ?.map(
+            (e) => BodyguardSeverityRule.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$BodyguardRuleToJson(BodyguardRule instance) => <String, dynamic>{
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bookmark_added_event.dart b/packages/stream_feeds/lib/src/generated/api/model/bookmark_added_event.dart
index 56511dd1..fb555601 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bookmark_added_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bookmark_added_event.dart
@@ -34,6 +34,7 @@ class BookmarkAddedEvent extends core.WsEvent with _$BookmarkAddedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bookmark_added_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/bookmark_added_event.g.dart
index 399048ee..26be0ffe 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bookmark_added_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bookmark_added_event.g.dart
@@ -11,10 +11,10 @@ BookmarkAddedEvent _$BookmarkAddedEventFromJson(
 ) => BookmarkAddedEvent(
   bookmark: BookmarkResponse.fromJson(json['bookmark'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -26,7 +26,7 @@ Map<String, dynamic> _$BookmarkAddedEventToJson(BookmarkAddedEvent instance) =>
   'bookmark': instance.bookmark.toJson(),
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bookmark_deleted_event.dart b/packages/stream_feeds/lib/src/generated/api/model/bookmark_deleted_event.dart
index fdb729b8..67206737 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bookmark_deleted_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bookmark_deleted_event.dart
@@ -34,6 +34,7 @@ class BookmarkDeletedEvent extends core.WsEvent with _$BookmarkDeletedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bookmark_deleted_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/bookmark_deleted_event.g.dart
index 8bf31f29..c7bb32f9 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bookmark_deleted_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bookmark_deleted_event.g.dart
@@ -11,10 +11,10 @@ BookmarkDeletedEvent _$BookmarkDeletedEventFromJson(
 ) => BookmarkDeletedEvent(
   bookmark: BookmarkResponse.fromJson(json['bookmark'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -28,7 +28,7 @@ Map<String, dynamic> _$BookmarkDeletedEventToJson(
   'bookmark': instance.bookmark.toJson(),
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_deleted_event.dart b/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_deleted_event.dart
index d0e8d44c..21760d9a 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_deleted_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_deleted_event.dart
@@ -34,6 +34,7 @@ class BookmarkFolderDeletedEvent extends core.WsEvent with _$BookmarkFolderDelet
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_deleted_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_deleted_event.g.dart
index 7a31b704..d05d7b32 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_deleted_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_deleted_event.g.dart
@@ -13,10 +13,10 @@ BookmarkFolderDeletedEvent _$BookmarkFolderDeletedEventFromJson(
     json['bookmark_folder'] as Map<String, dynamic>,
   ),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -30,7 +30,7 @@ Map<String, dynamic> _$BookmarkFolderDeletedEventToJson(
   'bookmark_folder': instance.bookmarkFolder.toJson(),
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_response.g.dart
index 45baf94c..24c9f5fb 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_response.g.dart
@@ -10,13 +10,13 @@ BookmarkFolderResponse _$BookmarkFolderResponseFromJson(
   Map<String, dynamic> json,
 ) => BookmarkFolderResponse(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   custom: json['custom'] as Map<String, dynamic>?,
   id: json['id'] as String,
   name: json['name'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: UserResponse.fromJson(json['user'] as Map<String, dynamic>),
 );
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_updated_event.dart b/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_updated_event.dart
index dd3c755a..fe9dec2c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_updated_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_updated_event.dart
@@ -34,6 +34,7 @@ class BookmarkFolderUpdatedEvent extends core.WsEvent with _$BookmarkFolderUpdat
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_updated_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_updated_event.g.dart
index 541310f1..c670e94d 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_updated_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bookmark_folder_updated_event.g.dart
@@ -13,10 +13,10 @@ BookmarkFolderUpdatedEvent _$BookmarkFolderUpdatedEventFromJson(
     json['bookmark_folder'] as Map<String, dynamic>,
   ),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -30,7 +30,7 @@ Map<String, dynamic> _$BookmarkFolderUpdatedEventToJson(
   'bookmark_folder': instance.bookmarkFolder.toJson(),
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bookmark_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/bookmark_response.g.dart
index 51d17260..9755619c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bookmark_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bookmark_response.g.dart
@@ -13,14 +13,14 @@ BookmarkResponse _$BookmarkResponseFromJson(
   activityId: json['activity_id'] as String?,
   comment: json['comment'] == null ? null : CommentResponse.fromJson(json['comment'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   custom: json['custom'] as Map<String, dynamic>?,
   folder: json['folder'] == null ? null : BookmarkFolderResponse.fromJson(json['folder'] as Map<String, dynamic>),
   objectId: json['object_id'] as String,
   objectType: json['object_type'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: UserResponse.fromJson(json['user'] as Map<String, dynamic>),
 );
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bookmark_updated_event.dart b/packages/stream_feeds/lib/src/generated/api/model/bookmark_updated_event.dart
index d02932a6..8127912e 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bookmark_updated_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bookmark_updated_event.dart
@@ -34,6 +34,7 @@ class BookmarkUpdatedEvent extends core.WsEvent with _$BookmarkUpdatedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bookmark_updated_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/bookmark_updated_event.g.dart
index e9f1dea6..433b4327 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bookmark_updated_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bookmark_updated_event.g.dart
@@ -11,10 +11,10 @@ BookmarkUpdatedEvent _$BookmarkUpdatedEventFromJson(
 ) => BookmarkUpdatedEvent(
   bookmark: BookmarkResponse.fromJson(json['bookmark'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -28,7 +28,7 @@ Map<String, dynamic> _$BookmarkUpdatedEventToJson(
   'bookmark': instance.bookmark.toJson(),
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bulk_action_appeals_request.dart b/packages/stream_feeds/lib/src/generated/api/model/bulk_action_appeals_request.dart
index c1ed23be..6ba55b93 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bulk_action_appeals_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bulk_action_appeals_request.dart
@@ -48,6 +48,7 @@ class BulkActionAppealsRequest with _$BulkActionAppealsRequest {
   final BulkActionAppealsRequestActionType actionType;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> appealIds;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bulk_action_appeals_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/bulk_action_appeals_request.g.dart
index c5b7e328..119fb4b0 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bulk_action_appeals_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bulk_action_appeals_request.g.dart
@@ -14,7 +14,7 @@ BulkActionAppealsRequest _$BulkActionAppealsRequestFromJson(
     json['action_type'],
     unknownValue: BulkActionAppealsRequestActionType.unknown,
   ),
-  appealIds: (json['appeal_ids'] as List<dynamic>).map((e) => e as String).toList(),
+  appealIds: (json['appeal_ids'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   markReviewed: json['mark_reviewed'] == null
       ? null
       : MarkReviewedRequestPayload.fromJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bulk_action_appeals_response.dart b/packages/stream_feeds/lib/src/generated/api/model/bulk_action_appeals_response.dart
index 903ae32b..e5b86d5a 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bulk_action_appeals_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bulk_action_appeals_response.dart
@@ -27,9 +27,11 @@ class BulkActionAppealsResponse with _$BulkActionAppealsResponse {
   final String duration;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<BulkAppealError> errors;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<BulkAppealResult> results;
 
   Map<String, dynamic> toJson() => _$BulkActionAppealsResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bulk_action_appeals_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/bulk_action_appeals_response.g.dart
index af66d4b4..00b6d4fa 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bulk_action_appeals_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bulk_action_appeals_response.g.dart
@@ -10,8 +10,12 @@ BulkActionAppealsResponse _$BulkActionAppealsResponseFromJson(
   Map<String, dynamic> json,
 ) => BulkActionAppealsResponse(
   duration: json['duration'] as String,
-  errors: (json['errors'] as List<dynamic>).map((e) => BulkAppealError.fromJson(e as Map<String, dynamic>)).toList(),
-  results: (json['results'] as List<dynamic>).map((e) => BulkAppealResult.fromJson(e as Map<String, dynamic>)).toList(),
+  errors:
+      (json['errors'] as List<dynamic>?)?.map((e) => BulkAppealError.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
+  results:
+      (json['results'] as List<dynamic>?)?.map((e) => BulkAppealResult.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
 );
 
 Map<String, dynamic> _$BulkActionAppealsResponseToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bulk_delete_action_config_request.dart b/packages/stream_feeds/lib/src/generated/api/model/bulk_delete_action_config_request.dart
index 5c6c4808..5d9e560c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bulk_delete_action_config_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bulk_delete_action_config_request.dart
@@ -22,6 +22,7 @@ class BulkDeleteActionConfigRequest with _$BulkDeleteActionConfigRequest {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> ids;
 
   Map<String, dynamic> toJson() => _$BulkDeleteActionConfigRequestToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bulk_delete_action_config_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/bulk_delete_action_config_request.g.dart
index 5c7156b9..ac15f96c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bulk_delete_action_config_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bulk_delete_action_config_request.g.dart
@@ -9,7 +9,7 @@ part of 'bulk_delete_action_config_request.dart';
 BulkDeleteActionConfigRequest _$BulkDeleteActionConfigRequestFromJson(
   Map<String, dynamic> json,
 ) => BulkDeleteActionConfigRequest(
-  ids: (json['ids'] as List<dynamic>).map((e) => e as String).toList(),
+  ids: (json['ids'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
 );
 
 Map<String, dynamic> _$BulkDeleteActionConfigRequestToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bulk_upsert_action_config_request.dart b/packages/stream_feeds/lib/src/generated/api/model/bulk_upsert_action_config_request.dart
index 1964b378..5473515a 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bulk_upsert_action_config_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bulk_upsert_action_config_request.dart
@@ -22,6 +22,7 @@ class BulkUpsertActionConfigRequest with _$BulkUpsertActionConfigRequest {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<UpsertActionConfigItem> actionConfigs;
 
   Map<String, dynamic> toJson() => _$BulkUpsertActionConfigRequestToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bulk_upsert_action_config_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/bulk_upsert_action_config_request.g.dart
index d378c064..7b852eb5 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bulk_upsert_action_config_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bulk_upsert_action_config_request.g.dart
@@ -9,9 +9,13 @@ part of 'bulk_upsert_action_config_request.dart';
 BulkUpsertActionConfigRequest _$BulkUpsertActionConfigRequestFromJson(
   Map<String, dynamic> json,
 ) => BulkUpsertActionConfigRequest(
-  actionConfigs: (json['action_configs'] as List<dynamic>)
-      .map((e) => UpsertActionConfigItem.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  actionConfigs:
+      (json['action_configs'] as List<dynamic>?)
+          ?.map(
+            (e) => UpsertActionConfigItem.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$BulkUpsertActionConfigRequestToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bulk_upsert_action_config_response.dart b/packages/stream_feeds/lib/src/generated/api/model/bulk_upsert_action_config_response.dart
index 405ea8da..6f696ffe 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bulk_upsert_action_config_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bulk_upsert_action_config_response.dart
@@ -23,6 +23,7 @@ class BulkUpsertActionConfigResponse with _$BulkUpsertActionConfigResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ModerationActionConfigResponse> actionConfigs;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/bulk_upsert_action_config_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/bulk_upsert_action_config_response.g.dart
index 33d5b788..95c732cb 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/bulk_upsert_action_config_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/bulk_upsert_action_config_response.g.dart
@@ -9,11 +9,15 @@ part of 'bulk_upsert_action_config_response.dart';
 BulkUpsertActionConfigResponse _$BulkUpsertActionConfigResponseFromJson(
   Map<String, dynamic> json,
 ) => BulkUpsertActionConfigResponse(
-  actionConfigs: (json['action_configs'] as List<dynamic>)
-      .map(
-        (e) => ModerationActionConfigResponse.fromJson(e as Map<String, dynamic>),
-      )
-      .toList(),
+  actionConfigs:
+      (json['action_configs'] as List<dynamic>?)
+          ?.map(
+            (e) => ModerationActionConfigResponse.fromJson(
+              e as Map<String, dynamic>,
+            ),
+          )
+          .toList() ??
+      [],
   duration: json['duration'] as String,
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/call_response.dart b/packages/stream_feeds/lib/src/generated/api/model/call_response.dart
index 0d24c139..7116cd6c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/call_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/call_response.dart
@@ -44,6 +44,7 @@ class CallResponse with _$CallResponse {
   final bool backstage;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> blockedUserIds;
 
   @override
@@ -66,6 +67,7 @@ class CallResponse with _$CallResponse {
   final String currentSessionId;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/call_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/call_response.g.dart
index f2f4cab4..a8e3c173 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/call_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/call_response.g.dart
@@ -8,17 +8,17 @@ part of 'call_response.dart';
 
 CallResponse _$CallResponseFromJson(Map<String, dynamic> json) => CallResponse(
   backstage: json['backstage'] as bool,
-  blockedUserIds: (json['blocked_user_ids'] as List<dynamic>).map((e) => e as String).toList(),
+  blockedUserIds: (json['blocked_user_ids'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   captioning: json['captioning'] as bool,
   channelCid: json['channel_cid'] as String?,
   cid: json['cid'] as String,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   createdBy: json['created_by'] == null ? null : UserResponse.fromJson(json['created_by'] as Map<String, dynamic>),
   currentSessionId: json['current_session_id'] as String,
-  custom: json['custom'] as Map<String, dynamic>,
-  endedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  endedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['ended_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -26,7 +26,7 @@ CallResponse _$CallResponseFromJson(Map<String, dynamic> json) => CallResponse(
   joinAheadTimeSeconds: (json['join_ahead_time_seconds'] as num?)?.toInt(),
   recording: json['recording'] as bool,
   routingNumber: json['routing_number'] as String?,
-  startsAt: _$JsonConverterFromJson<int, DateTime>(
+  startsAt: _$JsonConverterFromJson<Object, DateTime>(
     json['starts_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -35,7 +35,7 @@ CallResponse _$CallResponseFromJson(Map<String, dynamic> json) => CallResponse(
   translating: json['translating'] as bool,
   type: json['type'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
 );
 
@@ -49,7 +49,7 @@ Map<String, dynamic> _$CallResponseToJson(CallResponse instance) => <String, dyn
   'created_by': instance.createdBy?.toJson(),
   'current_session_id': instance.currentSessionId,
   'custom': instance.custom,
-  'ended_at': _$JsonConverterToJson<int, DateTime>(
+  'ended_at': _$JsonConverterToJson<Object, DateTime>(
     instance.endedAt,
     const EpochDateTimeConverter().toJson,
   ),
@@ -57,7 +57,7 @@ Map<String, dynamic> _$CallResponseToJson(CallResponse instance) => <String, dyn
   'join_ahead_time_seconds': instance.joinAheadTimeSeconds,
   'recording': instance.recording,
   'routing_number': instance.routingNumber,
-  'starts_at': _$JsonConverterToJson<int, DateTime>(
+  'starts_at': _$JsonConverterToJson<Object, DateTime>(
     instance.startsAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/channel_config_with_info.dart b/packages/stream_feeds/lib/src/generated/api/model/channel_config_with_info.dart
index 9be7fdbc..9df3a28a 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/channel_config_with_info.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/channel_config_with_info.dart
@@ -137,6 +137,7 @@ class ChannelConfigWithInfo with _$ChannelConfigWithInfo {
   final ChatPreferences? chatPreferences;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<Command> commands;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/channel_config_with_info.g.dart b/packages/stream_feeds/lib/src/generated/api/model/channel_config_with_info.g.dart
index 71de6adf..5b30dd42 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/channel_config_with_info.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/channel_config_with_info.g.dart
@@ -37,11 +37,12 @@ ChannelConfigWithInfo _$ChannelConfigWithInfoFromJson(
       : ChatPreferences.fromJson(
           json['chat_preferences'] as Map<String, dynamic>,
         ),
-  commands: (json['commands'] as List<dynamic>).map((e) => Command.fromJson(e as Map<String, dynamic>)).toList(),
+  commands:
+      (json['commands'] as List<dynamic>?)?.map((e) => Command.fromJson(e as Map<String, dynamic>)).toList() ?? [],
   connectEvents: json['connect_events'] as bool,
   countMessages: json['count_messages'] as bool,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   customEvents: json['custom_events'] as bool,
   deliveryEvents: json['delivery_events'] as bool,
@@ -71,7 +72,7 @@ ChannelConfigWithInfo _$ChannelConfigWithInfoFromJson(
   skipLastMsgUpdateForSystemMsgs: json['skip_last_msg_update_for_system_msgs'] as bool,
   typingEvents: json['typing_events'] as bool,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   uploads: json['uploads'] as bool,
   urlEnrichment: json['url_enrichment'] as bool,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/channel_member_response.dart b/packages/stream_feeds/lib/src/generated/api/model/channel_member_response.dart
index 9fef5e50..ecf69380 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/channel_member_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/channel_member_response.dart
@@ -59,6 +59,7 @@ class ChannelMemberResponse with _$ChannelMemberResponse {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/channel_member_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/channel_member_response.g.dart
index c7939bc6..5bec6ff0 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/channel_member_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/channel_member_response.g.dart
@@ -9,37 +9,37 @@ part of 'channel_member_response.dart';
 ChannelMemberResponse _$ChannelMemberResponseFromJson(
   Map<String, dynamic> json,
 ) => ChannelMemberResponse(
-  archivedAt: _$JsonConverterFromJson<int, DateTime>(
+  archivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['archived_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  banExpires: _$JsonConverterFromJson<int, DateTime>(
+  banExpires: _$JsonConverterFromJson<Object, DateTime>(
     json['ban_expires'],
     const EpochDateTimeConverter().fromJson,
   ),
   banned: json['banned'] as bool,
   channelRole: json['channel_role'] as String,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
   deletedMessages: (json['deleted_messages'] as List<dynamic>?)?.map((e) => e as String).toList(),
-  inviteAcceptedAt: _$JsonConverterFromJson<int, DateTime>(
+  inviteAcceptedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['invite_accepted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  inviteRejectedAt: _$JsonConverterFromJson<int, DateTime>(
+  inviteRejectedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['invite_rejected_at'],
     const EpochDateTimeConverter().fromJson,
   ),
   invited: json['invited'] as bool?,
   isModerator: json['is_moderator'] as bool?,
   notificationsMuted: json['notifications_muted'] as bool,
-  pinnedAt: _$JsonConverterFromJson<int, DateTime>(
+  pinnedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['pinned_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -47,7 +47,7 @@ ChannelMemberResponse _$ChannelMemberResponseFromJson(
   shadowBanned: json['shadow_banned'] as bool,
   status: json['status'] as String?,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: json['user'] == null ? null : UserResponse.fromJson(json['user'] as Map<String, dynamic>),
   userId: json['user_id'] as String?,
@@ -56,11 +56,11 @@ ChannelMemberResponse _$ChannelMemberResponseFromJson(
 Map<String, dynamic> _$ChannelMemberResponseToJson(
   ChannelMemberResponse instance,
 ) => <String, dynamic>{
-  'archived_at': _$JsonConverterToJson<int, DateTime>(
+  'archived_at': _$JsonConverterToJson<Object, DateTime>(
     instance.archivedAt,
     const EpochDateTimeConverter().toJson,
   ),
-  'ban_expires': _$JsonConverterToJson<int, DateTime>(
+  'ban_expires': _$JsonConverterToJson<Object, DateTime>(
     instance.banExpires,
     const EpochDateTimeConverter().toJson,
   ),
@@ -68,23 +68,23 @@ Map<String, dynamic> _$ChannelMemberResponseToJson(
   'channel_role': instance.channelRole,
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
   'deleted_messages': instance.deletedMessages,
-  'invite_accepted_at': _$JsonConverterToJson<int, DateTime>(
+  'invite_accepted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.inviteAcceptedAt,
     const EpochDateTimeConverter().toJson,
   ),
-  'invite_rejected_at': _$JsonConverterToJson<int, DateTime>(
+  'invite_rejected_at': _$JsonConverterToJson<Object, DateTime>(
     instance.inviteRejectedAt,
     const EpochDateTimeConverter().toJson,
   ),
   'invited': instance.invited,
   'is_moderator': instance.isModerator,
   'notifications_muted': instance.notificationsMuted,
-  'pinned_at': _$JsonConverterToJson<int, DateTime>(
+  'pinned_at': _$JsonConverterToJson<Object, DateTime>(
     instance.pinnedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/channel_mute.g.dart b/packages/stream_feeds/lib/src/generated/api/model/channel_mute.g.dart
index 1df49f2d..6da5b41c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/channel_mute.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/channel_mute.g.dart
@@ -9,14 +9,14 @@ part of 'channel_mute.dart';
 ChannelMute _$ChannelMuteFromJson(Map<String, dynamic> json) => ChannelMute(
   channel: json['channel'] == null ? null : ChannelResponse.fromJson(json['channel'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  expires: _$JsonConverterFromJson<int, DateTime>(
+  expires: _$JsonConverterFromJson<Object, DateTime>(
     json['expires'],
     const EpochDateTimeConverter().fromJson,
   ),
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: json['user'] == null ? null : UserResponse.fromJson(json['user'] as Map<String, dynamic>),
 );
@@ -24,7 +24,7 @@ ChannelMute _$ChannelMuteFromJson(Map<String, dynamic> json) => ChannelMute(
 Map<String, dynamic> _$ChannelMuteToJson(ChannelMute instance) => <String, dynamic>{
   'channel': instance.channel?.toJson(),
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
-  'expires': _$JsonConverterToJson<int, DateTime>(
+  'expires': _$JsonConverterToJson<Object, DateTime>(
     instance.expires,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/channel_push_preferences_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/channel_push_preferences_response.g.dart
index 79d8f8e3..05566884 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/channel_push_preferences_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/channel_push_preferences_response.g.dart
@@ -15,7 +15,7 @@ ChannelPushPreferencesResponse _$ChannelPushPreferencesResponseFromJson(
       : ChatPreferencesResponse.fromJson(
           json['chat_preferences'] as Map<String, dynamic>,
         ),
-  disabledUntil: _$JsonConverterFromJson<int, DateTime>(
+  disabledUntil: _$JsonConverterFromJson<Object, DateTime>(
     json['disabled_until'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -26,7 +26,7 @@ Map<String, dynamic> _$ChannelPushPreferencesResponseToJson(
 ) => <String, dynamic>{
   'chat_level': instance.chatLevel,
   'chat_preferences': instance.chatPreferences?.toJson(),
-  'disabled_until': _$JsonConverterToJson<int, DateTime>(
+  'disabled_until': _$JsonConverterToJson<Object, DateTime>(
     instance.disabledUntil,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/channel_response.dart b/packages/stream_feeds/lib/src/generated/api/model/channel_response.dart
index b17c0970..320e03af 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/channel_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/channel_response.dart
@@ -13,94 +13,6 @@ import '../models.dart';
 part 'channel_response.g.dart';
 part 'channel_response.freezed.dart';
 
-@JsonEnum(alwaysCreate: true)
-enum ChannelResponseOwnCapabilities {
-  @JsonValue('ban-channel-members')
-  banChannelMembers,
-  @JsonValue('cast-poll-vote')
-  castPollVote,
-  @JsonValue('connect-events')
-  connectEvents,
-  @JsonValue('create-attachment')
-  createAttachment,
-  @JsonValue('delete-any-message')
-  deleteAnyMessage,
-  @JsonValue('delete-channel')
-  deleteChannel,
-  @JsonValue('delete-own-message')
-  deleteOwnMessage,
-  @JsonValue('delivery-events')
-  deliveryEvents,
-  @JsonValue('flag-message')
-  flagMessage,
-  @JsonValue('freeze-channel')
-  freezeChannel,
-  @JsonValue('join-channel')
-  joinChannel,
-  @JsonValue('leave-channel')
-  leaveChannel,
-  @JsonValue('mute-channel')
-  muteChannel,
-  @JsonValue('notify-channel')
-  notifyChannel,
-  @JsonValue('notify-group')
-  notifyGroup,
-  @JsonValue('notify-here')
-  notifyHere,
-  @JsonValue('notify-role')
-  notifyRole,
-  @JsonValue('pin-message')
-  pinMessage,
-  @JsonValue('query-poll-votes')
-  queryPollVotes,
-  @JsonValue('quote-message')
-  quoteMessage,
-  @JsonValue('read-events')
-  readEvents,
-  @JsonValue('search-messages')
-  searchMessages,
-  @JsonValue('send-custom-events')
-  sendCustomEvents,
-  @JsonValue('send-links')
-  sendLinks,
-  @JsonValue('send-message')
-  sendMessage,
-  @JsonValue('send-poll')
-  sendPoll,
-  @JsonValue('send-reaction')
-  sendReaction,
-  @JsonValue('send-reply')
-  sendReply,
-  @JsonValue('send-restricted-visibility-message')
-  sendRestrictedVisibilityMessage,
-  @JsonValue('send-typing-events')
-  sendTypingEvents,
-  @JsonValue('set-channel-cooldown')
-  setChannelCooldown,
-  @JsonValue('share-location')
-  shareLocation,
-  @JsonValue('skip-slow-mode')
-  skipSlowMode,
-  @JsonValue('slow-mode')
-  slowMode,
-  @JsonValue('typing-events')
-  typingEvents,
-  @JsonValue('update-any-message')
-  updateAnyMessage,
-  @JsonValue('update-channel')
-  updateChannel,
-  @JsonValue('update-channel-members')
-  updateChannelMembers,
-  @JsonValue('update-own-message')
-  updateOwnMessage,
-  @JsonValue('update-thread')
-  updateThread,
-  @JsonValue('upload-file')
-  uploadFile,
-  @JsonValue('_unknown')
-  unknown,
-}
-
 @freezed
 @immutable
 @JsonSerializable()
@@ -162,6 +74,7 @@ class ChannelResponse with _$ChannelResponse {
   final UserResponse? createdBy;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
@@ -208,8 +121,8 @@ class ChannelResponse with _$ChannelResponse {
   final bool? muted;
 
   @override
-  @JsonKey(unknownEnumValue: ChannelResponseOwnCapabilities.unknown)
-  final List<ChannelResponseOwnCapabilities>? ownCapabilities;
+  @JsonKey(unknownEnumValue: ChannelOwnCapability.unknown)
+  final List<ChannelOwnCapability>? ownCapabilities;
 
   @override
   final String? team;
diff --git a/packages/stream_feeds/lib/src/generated/api/model/channel_response.freezed.dart b/packages/stream_feeds/lib/src/generated/api/model/channel_response.freezed.dart
index bd2329e5..0760e7e7 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/channel_response.freezed.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/channel_response.freezed.dart
@@ -35,7 +35,7 @@ mixin _$ChannelResponse {
   int? get messageCount;
   DateTime? get muteExpiresAt;
   bool? get muted;
-  List<ChannelResponseOwnCapabilities>? get ownCapabilities;
+  List<ChannelOwnCapability>? get ownCapabilities;
   String? get team;
   DateTime? get truncatedAt;
   UserResponse? get truncatedBy;
@@ -167,7 +167,7 @@ abstract mixin class $ChannelResponseCopyWith<$Res> {
     int? messageCount,
     DateTime? muteExpiresAt,
     bool? muted,
-    List<ChannelResponseOwnCapabilities>? ownCapabilities,
+    List<ChannelOwnCapability>? ownCapabilities,
     String? team,
     DateTime? truncatedAt,
     UserResponse? truncatedBy,
@@ -310,7 +310,7 @@ class _$ChannelResponseCopyWithImpl<$Res> implements $ChannelResponseCopyWith<$R
         ownCapabilities: freezed == ownCapabilities
             ? _self.ownCapabilities
             : ownCapabilities // ignore: cast_nullable_to_non_nullable
-                  as List<ChannelResponseOwnCapabilities>?,
+                  as List<ChannelOwnCapability>?,
         team: freezed == team
             ? _self.team
             : team // ignore: cast_nullable_to_non_nullable
diff --git a/packages/stream_feeds/lib/src/generated/api/model/channel_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/channel_response.g.dart
index 8262b607..31e2d9c4 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/channel_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/channel_response.g.dart
@@ -16,11 +16,11 @@ ChannelResponse _$ChannelResponseFromJson(
   config: json['config'] == null ? null : ChannelConfigWithInfo.fromJson(json['config'] as Map<String, dynamic>),
   cooldown: (json['cooldown'] as num?)?.toInt(),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   createdBy: json['created_by'] == null ? null : UserResponse.fromJson(json['created_by'] as Map<String, dynamic>),
-  custom: json['custom'] as Map<String, dynamic>,
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -28,12 +28,12 @@ ChannelResponse _$ChannelResponseFromJson(
   filterTags: (json['filter_tags'] as List<dynamic>?)?.map((e) => e as String).toList(),
   frozen: json['frozen'] as bool,
   hidden: json['hidden'] as bool?,
-  hideMessagesBefore: _$JsonConverterFromJson<int, DateTime>(
+  hideMessagesBefore: _$JsonConverterFromJson<Object, DateTime>(
     json['hide_messages_before'],
     const EpochDateTimeConverter().fromJson,
   ),
   id: json['id'] as String,
-  lastMessageAt: _$JsonConverterFromJson<int, DateTime>(
+  lastMessageAt: _$JsonConverterFromJson<Object, DateTime>(
     json['last_message_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -42,7 +42,7 @@ ChannelResponse _$ChannelResponseFromJson(
       ?.map((e) => ChannelMemberResponse.fromJson(e as Map<String, dynamic>))
       .toList(),
   messageCount: (json['message_count'] as num?)?.toInt(),
-  muteExpiresAt: _$JsonConverterFromJson<int, DateTime>(
+  muteExpiresAt: _$JsonConverterFromJson<Object, DateTime>(
     json['mute_expires_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -50,14 +50,14 @@ ChannelResponse _$ChannelResponseFromJson(
   ownCapabilities: (json['own_capabilities'] as List<dynamic>?)
       ?.map(
         (e) => $enumDecode(
-          _$ChannelResponseOwnCapabilitiesEnumMap,
+          _$ChannelOwnCapabilityEnumMap,
           e,
-          unknownValue: ChannelResponseOwnCapabilities.unknown,
+          unknownValue: ChannelOwnCapability.unknown,
         ),
       )
       .toList(),
   team: json['team'] as String?,
-  truncatedAt: _$JsonConverterFromJson<int, DateTime>(
+  truncatedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['truncated_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -66,7 +66,7 @@ ChannelResponse _$ChannelResponseFromJson(
       : UserResponse.fromJson(json['truncated_by'] as Map<String, dynamic>),
   type: json['type'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
 );
 
@@ -80,7 +80,7 @@ Map<String, dynamic> _$ChannelResponseToJson(ChannelResponse instance) => <Strin
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'created_by': instance.createdBy?.toJson(),
   'custom': instance.custom,
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
@@ -88,26 +88,26 @@ Map<String, dynamic> _$ChannelResponseToJson(ChannelResponse instance) => <Strin
   'filter_tags': instance.filterTags,
   'frozen': instance.frozen,
   'hidden': instance.hidden,
-  'hide_messages_before': _$JsonConverterToJson<int, DateTime>(
+  'hide_messages_before': _$JsonConverterToJson<Object, DateTime>(
     instance.hideMessagesBefore,
     const EpochDateTimeConverter().toJson,
   ),
   'id': instance.id,
-  'last_message_at': _$JsonConverterToJson<int, DateTime>(
+  'last_message_at': _$JsonConverterToJson<Object, DateTime>(
     instance.lastMessageAt,
     const EpochDateTimeConverter().toJson,
   ),
   'member_count': instance.memberCount,
   'members': instance.members?.map((e) => e.toJson()).toList(),
   'message_count': instance.messageCount,
-  'mute_expires_at': _$JsonConverterToJson<int, DateTime>(
+  'mute_expires_at': _$JsonConverterToJson<Object, DateTime>(
     instance.muteExpiresAt,
     const EpochDateTimeConverter().toJson,
   ),
   'muted': instance.muted,
-  'own_capabilities': instance.ownCapabilities?.map((e) => _$ChannelResponseOwnCapabilitiesEnumMap[e]!).toList(),
+  'own_capabilities': instance.ownCapabilities?.map((e) => _$ChannelOwnCapabilityEnumMap[e]!).toList(),
   'team': instance.team,
-  'truncated_at': _$JsonConverterToJson<int, DateTime>(
+  'truncated_at': _$JsonConverterToJson<Object, DateTime>(
     instance.truncatedAt,
     const EpochDateTimeConverter().toJson,
   ),
@@ -121,49 +121,49 @@ Value? _$JsonConverterFromJson<Json, Value>(
   Value? Function(Json json) fromJson,
 ) => json == null ? null : fromJson(json as Json);
 
-const _$ChannelResponseOwnCapabilitiesEnumMap = {
-  ChannelResponseOwnCapabilities.banChannelMembers: 'ban-channel-members',
-  ChannelResponseOwnCapabilities.castPollVote: 'cast-poll-vote',
-  ChannelResponseOwnCapabilities.connectEvents: 'connect-events',
-  ChannelResponseOwnCapabilities.createAttachment: 'create-attachment',
-  ChannelResponseOwnCapabilities.deleteAnyMessage: 'delete-any-message',
-  ChannelResponseOwnCapabilities.deleteChannel: 'delete-channel',
-  ChannelResponseOwnCapabilities.deleteOwnMessage: 'delete-own-message',
-  ChannelResponseOwnCapabilities.deliveryEvents: 'delivery-events',
-  ChannelResponseOwnCapabilities.flagMessage: 'flag-message',
-  ChannelResponseOwnCapabilities.freezeChannel: 'freeze-channel',
-  ChannelResponseOwnCapabilities.joinChannel: 'join-channel',
-  ChannelResponseOwnCapabilities.leaveChannel: 'leave-channel',
-  ChannelResponseOwnCapabilities.muteChannel: 'mute-channel',
-  ChannelResponseOwnCapabilities.notifyChannel: 'notify-channel',
-  ChannelResponseOwnCapabilities.notifyGroup: 'notify-group',
-  ChannelResponseOwnCapabilities.notifyHere: 'notify-here',
-  ChannelResponseOwnCapabilities.notifyRole: 'notify-role',
-  ChannelResponseOwnCapabilities.pinMessage: 'pin-message',
-  ChannelResponseOwnCapabilities.queryPollVotes: 'query-poll-votes',
-  ChannelResponseOwnCapabilities.quoteMessage: 'quote-message',
-  ChannelResponseOwnCapabilities.readEvents: 'read-events',
-  ChannelResponseOwnCapabilities.searchMessages: 'search-messages',
-  ChannelResponseOwnCapabilities.sendCustomEvents: 'send-custom-events',
-  ChannelResponseOwnCapabilities.sendLinks: 'send-links',
-  ChannelResponseOwnCapabilities.sendMessage: 'send-message',
-  ChannelResponseOwnCapabilities.sendPoll: 'send-poll',
-  ChannelResponseOwnCapabilities.sendReaction: 'send-reaction',
-  ChannelResponseOwnCapabilities.sendReply: 'send-reply',
-  ChannelResponseOwnCapabilities.sendRestrictedVisibilityMessage: 'send-restricted-visibility-message',
-  ChannelResponseOwnCapabilities.sendTypingEvents: 'send-typing-events',
-  ChannelResponseOwnCapabilities.setChannelCooldown: 'set-channel-cooldown',
-  ChannelResponseOwnCapabilities.shareLocation: 'share-location',
-  ChannelResponseOwnCapabilities.skipSlowMode: 'skip-slow-mode',
-  ChannelResponseOwnCapabilities.slowMode: 'slow-mode',
-  ChannelResponseOwnCapabilities.typingEvents: 'typing-events',
-  ChannelResponseOwnCapabilities.updateAnyMessage: 'update-any-message',
-  ChannelResponseOwnCapabilities.updateChannel: 'update-channel',
-  ChannelResponseOwnCapabilities.updateChannelMembers: 'update-channel-members',
-  ChannelResponseOwnCapabilities.updateOwnMessage: 'update-own-message',
-  ChannelResponseOwnCapabilities.updateThread: 'update-thread',
-  ChannelResponseOwnCapabilities.uploadFile: 'upload-file',
-  ChannelResponseOwnCapabilities.unknown: '_unknown',
+const _$ChannelOwnCapabilityEnumMap = {
+  ChannelOwnCapability.banChannelMembers: 'ban-channel-members',
+  ChannelOwnCapability.castPollVote: 'cast-poll-vote',
+  ChannelOwnCapability.connectEvents: 'connect-events',
+  ChannelOwnCapability.createAttachment: 'create-attachment',
+  ChannelOwnCapability.deleteAnyMessage: 'delete-any-message',
+  ChannelOwnCapability.deleteChannel: 'delete-channel',
+  ChannelOwnCapability.deleteOwnMessage: 'delete-own-message',
+  ChannelOwnCapability.deliveryEvents: 'delivery-events',
+  ChannelOwnCapability.flagMessage: 'flag-message',
+  ChannelOwnCapability.freezeChannel: 'freeze-channel',
+  ChannelOwnCapability.joinChannel: 'join-channel',
+  ChannelOwnCapability.leaveChannel: 'leave-channel',
+  ChannelOwnCapability.muteChannel: 'mute-channel',
+  ChannelOwnCapability.notifyChannel: 'notify-channel',
+  ChannelOwnCapability.notifyGroup: 'notify-group',
+  ChannelOwnCapability.notifyHere: 'notify-here',
+  ChannelOwnCapability.notifyRole: 'notify-role',
+  ChannelOwnCapability.pinMessage: 'pin-message',
+  ChannelOwnCapability.queryPollVotes: 'query-poll-votes',
+  ChannelOwnCapability.quoteMessage: 'quote-message',
+  ChannelOwnCapability.readEvents: 'read-events',
+  ChannelOwnCapability.searchMessages: 'search-messages',
+  ChannelOwnCapability.sendCustomEvents: 'send-custom-events',
+  ChannelOwnCapability.sendLinks: 'send-links',
+  ChannelOwnCapability.sendMessage: 'send-message',
+  ChannelOwnCapability.sendPoll: 'send-poll',
+  ChannelOwnCapability.sendReaction: 'send-reaction',
+  ChannelOwnCapability.sendReply: 'send-reply',
+  ChannelOwnCapability.sendRestrictedVisibilityMessage: 'send-restricted-visibility-message',
+  ChannelOwnCapability.sendTypingEvents: 'send-typing-events',
+  ChannelOwnCapability.setChannelCooldown: 'set-channel-cooldown',
+  ChannelOwnCapability.shareLocation: 'share-location',
+  ChannelOwnCapability.skipSlowMode: 'skip-slow-mode',
+  ChannelOwnCapability.slowMode: 'slow-mode',
+  ChannelOwnCapability.typingEvents: 'typing-events',
+  ChannelOwnCapability.updateAnyMessage: 'update-any-message',
+  ChannelOwnCapability.updateChannel: 'update-channel',
+  ChannelOwnCapability.updateChannelMembers: 'update-channel-members',
+  ChannelOwnCapability.updateOwnMessage: 'update-own-message',
+  ChannelOwnCapability.updateThread: 'update-thread',
+  ChannelOwnCapability.uploadFile: 'upload-file',
+  ChannelOwnCapability.unknown: '_unknown',
 };
 
 Json? _$JsonConverterToJson<Json, Value>(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/chat_draft_payload_response.dart b/packages/stream_feeds/lib/src/generated/api/model/chat_draft_payload_response.dart
index f06faf3b..17cdfc39 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/chat_draft_payload_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/chat_draft_payload_response.dart
@@ -37,6 +37,7 @@ class ChatDraftPayloadResponse with _$ChatDraftPayloadResponse {
   final List<Attachment>? attachments;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/chat_draft_payload_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/chat_draft_payload_response.g.dart
index 13ec793c..f6d352b1 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/chat_draft_payload_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/chat_draft_payload_response.g.dart
@@ -12,7 +12,7 @@ ChatDraftPayloadResponse _$ChatDraftPayloadResponseFromJson(
   attachments: (json['attachments'] as List<dynamic>?)
       ?.map((e) => Attachment.fromJson(e as Map<String, dynamic>))
       .toList(),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   html: json['html'] as String?,
   id: json['id'] as String,
   mentionedUsers: (json['mentioned_users'] as List<dynamic>?)
diff --git a/packages/stream_feeds/lib/src/generated/api/model/chat_draft_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/chat_draft_response.g.dart
index 166f3073..4bfa5c48 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/chat_draft_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/chat_draft_response.g.dart
@@ -9,7 +9,7 @@ part of 'chat_draft_response.dart';
 ChatDraftResponse _$ChatDraftResponseFromJson(Map<String, dynamic> json) => ChatDraftResponse(
   channelCid: json['channel_cid'] as String,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   message: ChatDraftPayloadResponse.fromJson(
     json['message'] as Map<String, dynamic>,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/chat_message_response.dart b/packages/stream_feeds/lib/src/generated/api/model/chat_message_response.dart
index b3568e44..226b02e1 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/chat_message_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/chat_message_response.dart
@@ -70,6 +70,7 @@ class ChatMessageResponse with _$ChatMessageResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<Attachment> attachments;
 
   @override
@@ -83,6 +84,7 @@ class ChatMessageResponse with _$ChatMessageResponse {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
@@ -111,6 +113,7 @@ class ChatMessageResponse with _$ChatMessageResponse {
   final Map<String, List<String>>? imageLabels;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ChatReactionResponse> latestReactions;
 
   @override
@@ -132,6 +135,7 @@ class ChatMessageResponse with _$ChatMessageResponse {
   final List<String>? mentionedRoles;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<UserResponse> mentionedUsers;
 
   @override
@@ -145,6 +149,7 @@ class ChatMessageResponse with _$ChatMessageResponse {
   final ChatModerationV2Response? moderation;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ChatReactionResponse> ownReactions;
 
   @override
@@ -177,12 +182,14 @@ class ChatMessageResponse with _$ChatMessageResponse {
   final String? quotedMessageId;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, int> reactionCounts;
 
   @override
   final Map<String, ChatReactionGroupResponse>? reactionGroups;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, int> reactionScores;
 
   @override
@@ -192,6 +199,7 @@ class ChatMessageResponse with _$ChatMessageResponse {
   final int replyCount;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> restrictedVisibility;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/chat_message_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/chat_message_response.g.dart
index 3271ef12..e4da0226 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/chat_message_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/chat_message_response.g.dart
@@ -6,17 +6,19 @@ part of 'chat_message_response.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-ChatMessageResponse _$ChatMessageResponseFromJson(Map<String, dynamic> json) => ChatMessageResponse(
-  attachments: (json['attachments'] as List<dynamic>)
-      .map((e) => Attachment.fromJson(e as Map<String, dynamic>))
-      .toList(),
+ChatMessageResponse _$ChatMessageResponseFromJson(
+  Map<String, dynamic> json,
+) => ChatMessageResponse(
+  attachments:
+      (json['attachments'] as List<dynamic>?)?.map((e) => Attachment.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   cid: json['cid'] as String,
   command: json['command'] as String?,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -31,14 +33,12 @@ ChatMessageResponse _$ChatMessageResponseFromJson(Map<String, dynamic> json) =>
   imageLabels: (json['image_labels'] as Map<String, dynamic>?)?.map(
     (k, e) => MapEntry(k, (e as List<dynamic>).map((e) => e as String).toList()),
   ),
-  latestReactions: (json['latest_reactions'] as List<dynamic>)
-      .map((e) => ChatReactionResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
-  member: json['member'] == null
-      ? null
-      : ChannelMemberResponse.fromJson(
-          json['member'] as Map<String, dynamic>,
-        ),
+  latestReactions:
+      (json['latest_reactions'] as List<dynamic>?)
+          ?.map((e) => ChatReactionResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
+  member: json['member'] == null ? null : ChannelMemberResponse.fromJson(json['member'] as Map<String, dynamic>),
   mentionedChannel: json['mentioned_channel'] as bool,
   mentionedGroupIds: (json['mentioned_group_ids'] as List<dynamic>?)?.map((e) => e as String).toList(),
   mentionedGroups: (json['mentioned_groups'] as List<dynamic>?)
@@ -46,10 +46,12 @@ ChatMessageResponse _$ChatMessageResponseFromJson(Map<String, dynamic> json) =>
       .toList(),
   mentionedHere: json['mentioned_here'] as bool,
   mentionedRoles: (json['mentioned_roles'] as List<dynamic>?)?.map((e) => e as String).toList(),
-  mentionedUsers: (json['mentioned_users'] as List<dynamic>)
-      .map((e) => UserResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
-  messageTextUpdatedAt: _$JsonConverterFromJson<int, DateTime>(
+  mentionedUsers:
+      (json['mentioned_users'] as List<dynamic>?)
+          ?.map((e) => UserResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
+  messageTextUpdatedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['message_text_updated_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -59,16 +61,18 @@ ChatMessageResponse _$ChatMessageResponseFromJson(Map<String, dynamic> json) =>
       : ChatModerationV2Response.fromJson(
           json['moderation'] as Map<String, dynamic>,
         ),
-  ownReactions: (json['own_reactions'] as List<dynamic>)
-      .map((e) => ChatReactionResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  ownReactions:
+      (json['own_reactions'] as List<dynamic>?)
+          ?.map((e) => ChatReactionResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   parentId: json['parent_id'] as String?,
-  pinExpires: _$JsonConverterFromJson<int, DateTime>(
+  pinExpires: _$JsonConverterFromJson<Object, DateTime>(
     json['pin_expires'],
     const EpochDateTimeConverter().fromJson,
   ),
   pinned: json['pinned'] as bool,
-  pinnedAt: _$JsonConverterFromJson<int, DateTime>(
+  pinnedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['pinned_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -81,21 +85,29 @@ ChatMessageResponse _$ChatMessageResponseFromJson(Map<String, dynamic> json) =>
           json['quoted_message'] as Map<String, dynamic>,
         ),
   quotedMessageId: json['quoted_message_id'] as String?,
-  reactionCounts: Map<String, int>.from(json['reaction_counts'] as Map),
+  reactionCounts:
+      (json['reaction_counts'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, (e as num).toInt()),
+      ) ??
+      {},
   reactionGroups: (json['reaction_groups'] as Map<String, dynamic>?)?.map(
     (k, e) => MapEntry(
       k,
       ChatReactionGroupResponse.fromJson(e as Map<String, dynamic>),
     ),
   ),
-  reactionScores: Map<String, int>.from(json['reaction_scores'] as Map),
+  reactionScores:
+      (json['reaction_scores'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, (e as num).toInt()),
+      ) ??
+      {},
   reminder: json['reminder'] == null
       ? null
       : ChatReminderResponseData.fromJson(
           json['reminder'] as Map<String, dynamic>,
         ),
   replyCount: (json['reply_count'] as num).toInt(),
-  restrictedVisibility: (json['restricted_visibility'] as List<dynamic>).map((e) => e as String).toList(),
+  restrictedVisibility: (json['restricted_visibility'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   shadowed: json['shadowed'] as bool,
   sharedLocation: json['shared_location'] == null
       ? null
@@ -110,7 +122,7 @@ ChatMessageResponse _$ChatMessageResponseFromJson(Map<String, dynamic> json) =>
       .toList(),
   type: json['type'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: UserResponse.fromJson(json['user'] as Map<String, dynamic>),
 );
@@ -123,7 +135,7 @@ Map<String, dynamic> _$ChatMessageResponseToJson(
   'command': instance.command,
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
@@ -142,7 +154,7 @@ Map<String, dynamic> _$ChatMessageResponseToJson(
   'mentioned_here': instance.mentionedHere,
   'mentioned_roles': instance.mentionedRoles,
   'mentioned_users': instance.mentionedUsers.map((e) => e.toJson()).toList(),
-  'message_text_updated_at': _$JsonConverterToJson<int, DateTime>(
+  'message_text_updated_at': _$JsonConverterToJson<Object, DateTime>(
     instance.messageTextUpdatedAt,
     const EpochDateTimeConverter().toJson,
   ),
@@ -150,12 +162,12 @@ Map<String, dynamic> _$ChatMessageResponseToJson(
   'moderation': instance.moderation?.toJson(),
   'own_reactions': instance.ownReactions.map((e) => e.toJson()).toList(),
   'parent_id': instance.parentId,
-  'pin_expires': _$JsonConverterToJson<int, DateTime>(
+  'pin_expires': _$JsonConverterToJson<Object, DateTime>(
     instance.pinExpires,
     const EpochDateTimeConverter().toJson,
   ),
   'pinned': instance.pinned,
-  'pinned_at': _$JsonConverterToJson<int, DateTime>(
+  'pinned_at': _$JsonConverterToJson<Object, DateTime>(
     instance.pinnedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_group_response.dart b/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_group_response.dart
index 9a064b83..6f1e9cdb 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_group_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_group_response.dart
@@ -37,6 +37,7 @@ class ChatReactionGroupResponse with _$ChatReactionGroupResponse {
   final DateTime lastReactionAt;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ChatReactionGroupUserResponse> latestReactionsBy;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_group_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_group_response.g.dart
index 25fdbdd3..aed23aba 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_group_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_group_response.g.dart
@@ -11,16 +11,20 @@ ChatReactionGroupResponse _$ChatReactionGroupResponseFromJson(
 ) => ChatReactionGroupResponse(
   count: (json['count'] as num).toInt(),
   firstReactionAt: const EpochDateTimeConverter().fromJson(
-    (json['first_reaction_at'] as num).toInt(),
+    json['first_reaction_at'] as Object,
   ),
   lastReactionAt: const EpochDateTimeConverter().fromJson(
-    (json['last_reaction_at'] as num).toInt(),
+    json['last_reaction_at'] as Object,
   ),
-  latestReactionsBy: (json['latest_reactions_by'] as List<dynamic>)
-      .map(
-        (e) => ChatReactionGroupUserResponse.fromJson(e as Map<String, dynamic>),
-      )
-      .toList(),
+  latestReactionsBy:
+      (json['latest_reactions_by'] as List<dynamic>?)
+          ?.map(
+            (e) => ChatReactionGroupUserResponse.fromJson(
+              e as Map<String, dynamic>,
+            ),
+          )
+          .toList() ??
+      [],
   sumScores: (json['sum_scores'] as num).toInt(),
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_group_user_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_group_user_response.g.dart
index 94ebb679..02666ba0 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_group_user_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_group_user_response.g.dart
@@ -10,7 +10,7 @@ ChatReactionGroupUserResponse _$ChatReactionGroupUserResponseFromJson(
   Map<String, dynamic> json,
 ) => ChatReactionGroupUserResponse(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   user: json['user'] == null ? null : UserResponse.fromJson(json['user'] as Map<String, dynamic>),
   userId: json['user_id'] as String,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_response.dart b/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_response.dart
index 77b9b83f..ceea6298 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_response.dart
@@ -33,6 +33,7 @@ class ChatReactionResponse with _$ChatReactionResponse {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_response.g.dart
index bda72fe5..b603d190 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/chat_reaction_response.g.dart
@@ -10,14 +10,14 @@ ChatReactionResponse _$ChatReactionResponseFromJson(
   Map<String, dynamic> json,
 ) => ChatReactionResponse(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   messageId: json['message_id'] as String,
   score: (json['score'] as num).toInt(),
   type: json['type'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: UserResponse.fromJson(json['user'] as Map<String, dynamic>),
   userId: json['user_id'] as String,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/chat_reminder_response_data.g.dart b/packages/stream_feeds/lib/src/generated/api/model/chat_reminder_response_data.g.dart
index 893ea61e..27fda103 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/chat_reminder_response_data.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/chat_reminder_response_data.g.dart
@@ -11,16 +11,16 @@ ChatReminderResponseData _$ChatReminderResponseDataFromJson(
 ) => ChatReminderResponseData(
   channelCid: json['channel_cid'] as String,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   message: json['message'] == null ? null : ChatMessageResponse.fromJson(json['message'] as Map<String, dynamic>),
   messageId: json['message_id'] as String,
-  remindAt: _$JsonConverterFromJson<int, DateTime>(
+  remindAt: _$JsonConverterFromJson<Object, DateTime>(
     json['remind_at'],
     const EpochDateTimeConverter().fromJson,
   ),
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: json['user'] == null ? null : UserResponse.fromJson(json['user'] as Map<String, dynamic>),
   userId: json['user_id'] as String,
@@ -33,7 +33,7 @@ Map<String, dynamic> _$ChatReminderResponseDataToJson(
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'message': instance.message?.toJson(),
   'message_id': instance.messageId,
-  'remind_at': _$JsonConverterToJson<int, DateTime>(
+  'remind_at': _$JsonConverterToJson<Object, DateTime>(
     instance.remindAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/chat_shared_location_response_data.g.dart b/packages/stream_feeds/lib/src/generated/api/model/chat_shared_location_response_data.g.dart
index d4a1e775..cd79abfb 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/chat_shared_location_response_data.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/chat_shared_location_response_data.g.dart
@@ -11,10 +11,10 @@ ChatSharedLocationResponseData _$ChatSharedLocationResponseDataFromJson(
 ) => ChatSharedLocationResponseData(
   channelCid: json['channel_cid'] as String,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   createdByDeviceId: json['created_by_device_id'] as String,
-  endAt: _$JsonConverterFromJson<int, DateTime>(
+  endAt: _$JsonConverterFromJson<Object, DateTime>(
     json['end_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -23,7 +23,7 @@ ChatSharedLocationResponseData _$ChatSharedLocationResponseDataFromJson(
   message: json['message'] == null ? null : ChatMessageResponse.fromJson(json['message'] as Map<String, dynamic>),
   messageId: json['message_id'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   userId: json['user_id'] as String,
 );
@@ -34,7 +34,7 @@ Map<String, dynamic> _$ChatSharedLocationResponseDataToJson(
   'channel_cid': instance.channelCid,
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'created_by_device_id': instance.createdByDeviceId,
-  'end_at': _$JsonConverterToJson<int, DateTime>(
+  'end_at': _$JsonConverterToJson<Object, DateTime>(
     instance.endAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/collection_request.dart b/packages/stream_feeds/lib/src/generated/api/model/collection_request.dart
index eee0ddaf..9d8ce79b 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/collection_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/collection_request.dart
@@ -24,6 +24,7 @@ class CollectionRequest with _$CollectionRequest {
   });
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/collection_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/collection_request.g.dart
index 5998c0ce..fba51aa8 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/collection_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/collection_request.g.dart
@@ -7,7 +7,7 @@ part of 'collection_request.dart';
 // **************************************************************************
 
 CollectionRequest _$CollectionRequestFromJson(Map<String, dynamic> json) => CollectionRequest(
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   id: json['id'] as String?,
   name: json['name'] as String,
 );
diff --git a/packages/stream_feeds/lib/src/generated/api/model/collection_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/collection_response.g.dart
index 0487617e..a6cf4ec6 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/collection_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/collection_response.g.dart
@@ -7,14 +7,14 @@ part of 'collection_response.dart';
 // **************************************************************************
 
 CollectionResponse _$CollectionResponseFromJson(Map<String, dynamic> json) => CollectionResponse(
-  createdAt: _$JsonConverterFromJson<int, DateTime>(
+  createdAt: _$JsonConverterFromJson<Object, DateTime>(
     json['created_at'],
     const EpochDateTimeConverter().fromJson,
   ),
   custom: json['custom'] as Map<String, dynamic>?,
   id: json['id'] as String,
   name: json['name'] as String,
-  updatedAt: _$JsonConverterFromJson<int, DateTime>(
+  updatedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['updated_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -22,14 +22,14 @@ CollectionResponse _$CollectionResponseFromJson(Map<String, dynamic> json) => Co
 );
 
 Map<String, dynamic> _$CollectionResponseToJson(CollectionResponse instance) => <String, dynamic>{
-  'created_at': _$JsonConverterToJson<int, DateTime>(
+  'created_at': _$JsonConverterToJson<Object, DateTime>(
     instance.createdAt,
     const EpochDateTimeConverter().toJson,
   ),
   'custom': instance.custom,
   'id': instance.id,
   'name': instance.name,
-  'updated_at': _$JsonConverterToJson<int, DateTime>(
+  'updated_at': _$JsonConverterToJson<Object, DateTime>(
     instance.updatedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/command.g.dart b/packages/stream_feeds/lib/src/generated/api/model/command.g.dart
index 9cc0c291..bcdc44da 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/command.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/command.g.dart
@@ -8,14 +8,14 @@ part of 'command.dart';
 
 Command _$CommandFromJson(Map<String, dynamic> json) => Command(
   args: json['args'] as String,
-  createdAt: _$JsonConverterFromJson<int, DateTime>(
+  createdAt: _$JsonConverterFromJson<Object, DateTime>(
     json['created_at'],
     const EpochDateTimeConverter().fromJson,
   ),
   description: json['description'] as String,
   name: json['name'] as String,
   set: json['set'] as String,
-  updatedAt: _$JsonConverterFromJson<int, DateTime>(
+  updatedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['updated_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -23,14 +23,14 @@ Command _$CommandFromJson(Map<String, dynamic> json) => Command(
 
 Map<String, dynamic> _$CommandToJson(Command instance) => <String, dynamic>{
   'args': instance.args,
-  'created_at': _$JsonConverterToJson<int, DateTime>(
+  'created_at': _$JsonConverterToJson<Object, DateTime>(
     instance.createdAt,
     const EpochDateTimeConverter().toJson,
   ),
   'description': instance.description,
   'name': instance.name,
   'set': instance.set,
-  'updated_at': _$JsonConverterToJson<int, DateTime>(
+  'updated_at': _$JsonConverterToJson<Object, DateTime>(
     instance.updatedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/comment_added_event.dart b/packages/stream_feeds/lib/src/generated/api/model/comment_added_event.dart
index 32521753..a09aab64 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/comment_added_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/comment_added_event.dart
@@ -40,6 +40,7 @@ class CommentAddedEvent extends core.WsEvent with _$CommentAddedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/comment_added_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/comment_added_event.g.dart
index f86000b2..63fee7f2 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/comment_added_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/comment_added_event.g.dart
@@ -12,12 +12,12 @@ CommentAddedEvent _$CommentAddedEventFromJson(
   activity: ActivityResponse.fromJson(json['activity'] as Map<String, dynamic>),
   comment: CommentResponse.fromJson(json['comment'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -32,7 +32,7 @@ Map<String, dynamic> _$CommentAddedEventToJson(CommentAddedEvent instance) => <S
   'custom': instance.custom,
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/comment_deleted_event.dart b/packages/stream_feeds/lib/src/generated/api/model/comment_deleted_event.dart
index be47500b..7bd0ba34 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/comment_deleted_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/comment_deleted_event.dart
@@ -36,6 +36,7 @@ class CommentDeletedEvent extends core.WsEvent with _$CommentDeletedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/comment_deleted_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/comment_deleted_event.g.dart
index 02662a0b..b203637b 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/comment_deleted_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/comment_deleted_event.g.dart
@@ -11,12 +11,12 @@ CommentDeletedEvent _$CommentDeletedEventFromJson(
 ) => CommentDeletedEvent(
   comment: CommentResponse.fromJson(json['comment'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -32,7 +32,7 @@ Map<String, dynamic> _$CommentDeletedEventToJson(
   'custom': instance.custom,
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_added_event.dart b/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_added_event.dart
index 93b9400c..dd5556fb 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_added_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_added_event.dart
@@ -41,6 +41,7 @@ class CommentReactionAddedEvent extends core.WsEvent with _$CommentReactionAdded
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_added_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_added_event.g.dart
index fe6cd57f..285e791a 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_added_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_added_event.g.dart
@@ -12,15 +12,15 @@ CommentReactionAddedEvent _$CommentReactionAddedEventFromJson(
   activity: ActivityResponse.fromJson(json['activity'] as Map<String, dynamic>),
   comment: CommentResponse.fromJson(json['comment'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   reaction: FeedsReactionResponse.fromJson(
     json['reaction'] as Map<String, dynamic>,
   ),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -38,7 +38,7 @@ Map<String, dynamic> _$CommentReactionAddedEventToJson(
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'reaction': instance.reaction.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_deleted_event.dart b/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_deleted_event.dart
index 24e6da94..60eb09b2 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_deleted_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_deleted_event.dart
@@ -36,6 +36,7 @@ class CommentReactionDeletedEvent extends core.WsEvent with _$CommentReactionDel
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_deleted_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_deleted_event.g.dart
index 2832538c..9d0fd778 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_deleted_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_deleted_event.g.dart
@@ -11,15 +11,15 @@ CommentReactionDeletedEvent _$CommentReactionDeletedEventFromJson(
 ) => CommentReactionDeletedEvent(
   comment: CommentResponse.fromJson(json['comment'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   reaction: FeedsReactionResponse.fromJson(
     json['reaction'] as Map<String, dynamic>,
   ),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -35,7 +35,7 @@ Map<String, dynamic> _$CommentReactionDeletedEventToJson(
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'reaction': instance.reaction.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_updated_event.dart b/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_updated_event.dart
index 4f30423d..39856d2b 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_updated_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_updated_event.dart
@@ -41,6 +41,7 @@ class CommentReactionUpdatedEvent extends core.WsEvent with _$CommentReactionUpd
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_updated_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_updated_event.g.dart
index 4a727390..43b8b180 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_updated_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/comment_reaction_updated_event.g.dart
@@ -12,15 +12,15 @@ CommentReactionUpdatedEvent _$CommentReactionUpdatedEventFromJson(
   activity: ActivityResponse.fromJson(json['activity'] as Map<String, dynamic>),
   comment: CommentResponse.fromJson(json['comment'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   reaction: FeedsReactionResponse.fromJson(
     json['reaction'] as Map<String, dynamic>,
   ),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -38,7 +38,7 @@ Map<String, dynamic> _$CommentReactionUpdatedEventToJson(
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'reaction': instance.reaction.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/comment_response.dart b/packages/stream_feeds/lib/src/generated/api/model/comment_response.dart
index c6d3e9a8..75a5cb97 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/comment_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/comment_response.dart
@@ -99,6 +99,7 @@ class CommentResponse with _$CommentResponse {
   final List<FeedsReactionResponse>? latestReactions;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<UserResponse> mentionedUsers;
 
   @override
@@ -111,6 +112,7 @@ class CommentResponse with _$CommentResponse {
   final String objectType;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedsReactionResponse> ownReactions;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/comment_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/comment_response.g.dart
index 344fc749..55c89b9f 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/comment_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/comment_response.g.dart
@@ -14,15 +14,15 @@ CommentResponse _$CommentResponseFromJson(Map<String, dynamic> json) => CommentR
   confidenceScore: (json['confidence_score'] as num).toDouble(),
   controversyScore: (json['controversy_score'] as num?)?.toDouble(),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   custom: json['custom'] as Map<String, dynamic>?,
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
   downvoteCount: (json['downvote_count'] as num).toInt(),
-  editedAt: _$JsonConverterFromJson<int, DateTime>(
+  editedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['edited_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -32,9 +32,11 @@ CommentResponse _$CommentResponseFromJson(Map<String, dynamic> json) => CommentR
         (e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>),
       )
       .toList(),
-  mentionedUsers: (json['mentioned_users'] as List<dynamic>)
-      .map((e) => UserResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  mentionedUsers:
+      (json['mentioned_users'] as List<dynamic>?)
+          ?.map((e) => UserResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   moderation: json['moderation'] == null
       ? null
       : ModerationV2Response.fromJson(
@@ -42,9 +44,13 @@ CommentResponse _$CommentResponseFromJson(Map<String, dynamic> json) => CommentR
         ),
   objectId: json['object_id'] as String,
   objectType: json['object_type'] as String,
-  ownReactions: (json['own_reactions'] as List<dynamic>)
-      .map((e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  ownReactions:
+      (json['own_reactions'] as List<dynamic>?)
+          ?.map(
+            (e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
   parentId: json['parent_id'] as String?,
   reactionCount: (json['reaction_count'] as num).toInt(),
   reactionGroups: (json['reaction_groups'] as Map<String, dynamic>?)?.map(
@@ -62,7 +68,7 @@ CommentResponse _$CommentResponseFromJson(Map<String, dynamic> json) => CommentR
   ),
   text: json['text'] as String?,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   upvoteCount: (json['upvote_count'] as num).toInt(),
   user: UserResponse.fromJson(json['user'] as Map<String, dynamic>),
@@ -77,12 +83,12 @@ Map<String, dynamic> _$CommentResponseToJson(
   'controversy_score': instance.controversyScore,
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
   'downvote_count': instance.downvoteCount,
-  'edited_at': _$JsonConverterToJson<int, DateTime>(
+  'edited_at': _$JsonConverterToJson<Object, DateTime>(
     instance.editedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/comment_restored_event.dart b/packages/stream_feeds/lib/src/generated/api/model/comment_restored_event.dart
index cc2b484d..f0192f30 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/comment_restored_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/comment_restored_event.dart
@@ -36,6 +36,7 @@ class CommentRestoredEvent extends core.WsEvent with _$CommentRestoredEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/comment_restored_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/comment_restored_event.g.dart
index a1be4041..7a325cf9 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/comment_restored_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/comment_restored_event.g.dart
@@ -11,12 +11,12 @@ CommentRestoredEvent _$CommentRestoredEventFromJson(
 ) => CommentRestoredEvent(
   comment: CommentResponse.fromJson(json['comment'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -32,7 +32,7 @@ Map<String, dynamic> _$CommentRestoredEventToJson(
   'custom': instance.custom,
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/comment_updated_event.dart b/packages/stream_feeds/lib/src/generated/api/model/comment_updated_event.dart
index da4247e2..355671c0 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/comment_updated_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/comment_updated_event.dart
@@ -36,6 +36,7 @@ class CommentUpdatedEvent extends core.WsEvent with _$CommentUpdatedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/comment_updated_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/comment_updated_event.g.dart
index 46bee2a9..a87c9ec8 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/comment_updated_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/comment_updated_event.g.dart
@@ -11,12 +11,12 @@ CommentUpdatedEvent _$CommentUpdatedEventFromJson(
 ) => CommentUpdatedEvent(
   comment: CommentResponse.fromJson(json['comment'] as Map<String, dynamic>),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -32,7 +32,7 @@ Map<String, dynamic> _$CommentUpdatedEventToJson(
   'custom': instance.custom,
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/config_response.dart b/packages/stream_feeds/lib/src/generated/api/model/config_response.dart
index ebf877b4..43d04606 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/config_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/config_response.dart
@@ -87,6 +87,7 @@ class ConfigResponse with _$ConfigResponse {
   final LLMConfig? llmConfig;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> supportedVideoCallHarmTypes;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/config_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/config_response.g.dart
index 54233701..a44062de 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/config_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/config_response.g.dart
@@ -53,17 +53,16 @@ ConfigResponse _$ConfigResponseFromJson(
           json['block_list_config'] as Map<String, dynamic>,
         ),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   floodConfig: json['flood_config'] == null ? null : FloodConfig.fromJson(json['flood_config'] as Map<String, dynamic>),
   key: json['key'] as String,
   llmConfig: json['llm_config'] == null ? null : LLMConfig.fromJson(json['llm_config'] as Map<String, dynamic>),
-  supportedVideoCallHarmTypes: (json['supported_video_call_harm_types'] as List<dynamic>)
-      .map((e) => e as String)
-      .toList(),
+  supportedVideoCallHarmTypes:
+      (json['supported_video_call_harm_types'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   team: json['team'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   velocityFilterConfig: json['velocity_filter_config'] == null
       ? null
diff --git a/packages/stream_feeds/lib/src/generated/api/model/create_block_list_request.dart b/packages/stream_feeds/lib/src/generated/api/model/create_block_list_request.dart
index afdca5ff..83582a02 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/create_block_list_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/create_block_list_request.dart
@@ -61,6 +61,7 @@ class CreateBlockListRequest with _$CreateBlockListRequest {
   final CreateBlockListRequestType? type;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> words;
 
   Map<String, dynamic> toJson() => _$CreateBlockListRequestToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/create_block_list_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/create_block_list_request.g.dart
index 22aa0f9d..3cf9d7a9 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/create_block_list_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/create_block_list_request.g.dart
@@ -18,7 +18,7 @@ CreateBlockListRequest _$CreateBlockListRequestFromJson(
     json['type'],
     unknownValue: CreateBlockListRequestType.unknown,
   ),
-  words: (json['words'] as List<dynamic>).map((e) => e as String).toList(),
+  words: (json['words'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
 );
 
 Map<String, dynamic> _$CreateBlockListRequestToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/create_collections_request.dart b/packages/stream_feeds/lib/src/generated/api/model/create_collections_request.dart
index 6d64bdff..bedaa38e 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/create_collections_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/create_collections_request.dart
@@ -22,6 +22,7 @@ class CreateCollectionsRequest with _$CreateCollectionsRequest {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<CollectionRequest> collections;
 
   Map<String, dynamic> toJson() => _$CreateCollectionsRequestToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/create_collections_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/create_collections_request.g.dart
index 6f47db5a..c1e63067 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/create_collections_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/create_collections_request.g.dart
@@ -9,9 +9,11 @@ part of 'create_collections_request.dart';
 CreateCollectionsRequest _$CreateCollectionsRequestFromJson(
   Map<String, dynamic> json,
 ) => CreateCollectionsRequest(
-  collections: (json['collections'] as List<dynamic>)
-      .map((e) => CollectionRequest.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  collections:
+      (json['collections'] as List<dynamic>?)
+          ?.map((e) => CollectionRequest.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$CreateCollectionsRequestToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/create_collections_response.dart b/packages/stream_feeds/lib/src/generated/api/model/create_collections_response.dart
index f963df3b..55da673f 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/create_collections_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/create_collections_response.dart
@@ -23,6 +23,7 @@ class CreateCollectionsResponse with _$CreateCollectionsResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<CollectionResponse> collections;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/create_collections_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/create_collections_response.g.dart
index b0873cbf..ee9e9f3b 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/create_collections_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/create_collections_response.g.dart
@@ -9,9 +9,11 @@ part of 'create_collections_response.dart';
 CreateCollectionsResponse _$CreateCollectionsResponseFromJson(
   Map<String, dynamic> json,
 ) => CreateCollectionsResponse(
-  collections: (json['collections'] as List<dynamic>)
-      .map((e) => CollectionResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  collections:
+      (json['collections'] as List<dynamic>?)
+          ?.map((e) => CollectionResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   duration: json['duration'] as String,
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/create_feeds_batch_request.dart b/packages/stream_feeds/lib/src/generated/api/model/create_feeds_batch_request.dart
index 303bab69..3d9977b3 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/create_feeds_batch_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/create_feeds_batch_request.dart
@@ -26,6 +26,7 @@ class CreateFeedsBatchRequest with _$CreateFeedsBatchRequest {
   final bool? enrichOwnFields;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedRequest> feeds;
 
   Map<String, dynamic> toJson() => _$CreateFeedsBatchRequestToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/create_feeds_batch_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/create_feeds_batch_request.g.dart
index 4aac6c89..94af665d 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/create_feeds_batch_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/create_feeds_batch_request.g.dart
@@ -10,7 +10,7 @@ CreateFeedsBatchRequest _$CreateFeedsBatchRequestFromJson(
   Map<String, dynamic> json,
 ) => CreateFeedsBatchRequest(
   enrichOwnFields: json['enrich_own_fields'] as bool?,
-  feeds: (json['feeds'] as List<dynamic>).map((e) => FeedRequest.fromJson(e as Map<String, dynamic>)).toList(),
+  feeds: (json['feeds'] as List<dynamic>?)?.map((e) => FeedRequest.fromJson(e as Map<String, dynamic>)).toList() ?? [],
 );
 
 Map<String, dynamic> _$CreateFeedsBatchRequestToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/create_feeds_batch_response.dart b/packages/stream_feeds/lib/src/generated/api/model/create_feeds_batch_response.dart
index 6a6183d2..fc77bca8 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/create_feeds_batch_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/create_feeds_batch_response.dart
@@ -26,6 +26,7 @@ class CreateFeedsBatchResponse with _$CreateFeedsBatchResponse {
   final String duration;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedResponse> feeds;
 
   Map<String, dynamic> toJson() => _$CreateFeedsBatchResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/create_feeds_batch_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/create_feeds_batch_response.g.dart
index 0e6c56e6..db9c6302 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/create_feeds_batch_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/create_feeds_batch_response.g.dart
@@ -10,7 +10,7 @@ CreateFeedsBatchResponse _$CreateFeedsBatchResponseFromJson(
   Map<String, dynamic> json,
 ) => CreateFeedsBatchResponse(
   duration: json['duration'] as String,
-  feeds: (json['feeds'] as List<dynamic>).map((e) => FeedResponse.fromJson(e as Map<String, dynamic>)).toList(),
+  feeds: (json['feeds'] as List<dynamic>?)?.map((e) => FeedResponse.fromJson(e as Map<String, dynamic>)).toList() ?? [],
 );
 
 Map<String, dynamic> _$CreateFeedsBatchResponseToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/delete_activities_request.dart b/packages/stream_feeds/lib/src/generated/api/model/delete_activities_request.dart
index 81b982de..c625e5ce 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/delete_activities_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/delete_activities_request.dart
@@ -30,6 +30,7 @@ class DeleteActivitiesRequest with _$DeleteActivitiesRequest {
   final bool? hardDelete;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> ids;
 
   Map<String, dynamic> toJson() => _$DeleteActivitiesRequestToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/delete_activities_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/delete_activities_request.g.dart
index 8873b42a..49840dc8 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/delete_activities_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/delete_activities_request.g.dart
@@ -11,7 +11,7 @@ DeleteActivitiesRequest _$DeleteActivitiesRequestFromJson(
 ) => DeleteActivitiesRequest(
   deleteNotificationActivity: json['delete_notification_activity'] as bool?,
   hardDelete: json['hard_delete'] as bool?,
-  ids: (json['ids'] as List<dynamic>).map((e) => e as String).toList(),
+  ids: (json['ids'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
 );
 
 Map<String, dynamic> _$DeleteActivitiesRequestToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/delete_activities_response.dart b/packages/stream_feeds/lib/src/generated/api/model/delete_activities_response.dart
index 55abcd12..910e84e0 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/delete_activities_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/delete_activities_response.dart
@@ -23,6 +23,7 @@ class DeleteActivitiesResponse with _$DeleteActivitiesResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> deletedIds;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/delete_activities_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/delete_activities_response.g.dart
index d2189f3e..8fd0c10e 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/delete_activities_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/delete_activities_response.g.dart
@@ -9,7 +9,7 @@ part of 'delete_activities_response.dart';
 DeleteActivitiesResponse _$DeleteActivitiesResponseFromJson(
   Map<String, dynamic> json,
 ) => DeleteActivitiesResponse(
-  deletedIds: (json['deleted_ids'] as List<dynamic>).map((e) => e as String).toList(),
+  deletedIds: (json['deleted_ids'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   duration: json['duration'] as String,
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/device_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/device_response.g.dart
index 415e754a..c9eaafaa 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/device_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/device_response.g.dart
@@ -8,7 +8,7 @@ part of 'device_response.dart';
 
 DeviceResponse _$DeviceResponseFromJson(Map<String, dynamic> json) => DeviceResponse(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   disabled: json['disabled'] as bool?,
   disabledReason: json['disabled_reason'] as String?,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/draft_payload_response.dart b/packages/stream_feeds/lib/src/generated/api/model/draft_payload_response.dart
index 61d085b2..0f4c732c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/draft_payload_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/draft_payload_response.dart
@@ -37,6 +37,7 @@ class DraftPayloadResponse with _$DraftPayloadResponse {
   final List<Attachment>? attachments;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/draft_payload_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/draft_payload_response.g.dart
index bc4c1e93..d2bc8235 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/draft_payload_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/draft_payload_response.g.dart
@@ -12,7 +12,7 @@ DraftPayloadResponse _$DraftPayloadResponseFromJson(
   attachments: (json['attachments'] as List<dynamic>?)
       ?.map((e) => Attachment.fromJson(e as Map<String, dynamic>))
       .toList(),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   html: json['html'] as String?,
   id: json['id'] as String,
   mentionedUsers: (json['mentioned_users'] as List<dynamic>?)
diff --git a/packages/stream_feeds/lib/src/generated/api/model/draft_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/draft_response.g.dart
index 05e70d05..682c85da 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/draft_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/draft_response.g.dart
@@ -10,7 +10,7 @@ DraftResponse _$DraftResponseFromJson(Map<String, dynamic> json) => DraftRespons
   channel: json['channel'] == null ? null : ChannelResponse.fromJson(json['channel'] as Map<String, dynamic>),
   channelCid: json['channel_cid'] as String,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   message: DraftPayloadResponse.fromJson(
     json['message'] as Map<String, dynamic>,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/enriched_collection_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/enriched_collection_response.g.dart
index 391a77a1..045eff80 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/enriched_collection_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/enriched_collection_response.g.dart
@@ -9,7 +9,7 @@ part of 'enriched_collection_response.dart';
 EnrichedCollectionResponse _$EnrichedCollectionResponseFromJson(
   Map<String, dynamic> json,
 ) => EnrichedCollectionResponse(
-  createdAt: _$JsonConverterFromJson<int, DateTime>(
+  createdAt: _$JsonConverterFromJson<Object, DateTime>(
     json['created_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -21,7 +21,7 @@ EnrichedCollectionResponse _$EnrichedCollectionResponseFromJson(
     json['status'],
     unknownValue: EnrichedCollectionResponseStatus.unknown,
   ),
-  updatedAt: _$JsonConverterFromJson<int, DateTime>(
+  updatedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['updated_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -31,7 +31,7 @@ EnrichedCollectionResponse _$EnrichedCollectionResponseFromJson(
 Map<String, dynamic> _$EnrichedCollectionResponseToJson(
   EnrichedCollectionResponse instance,
 ) => <String, dynamic>{
-  'created_at': _$JsonConverterToJson<int, DateTime>(
+  'created_at': _$JsonConverterToJson<Object, DateTime>(
     instance.createdAt,
     const EpochDateTimeConverter().toJson,
   ),
@@ -39,7 +39,7 @@ Map<String, dynamic> _$EnrichedCollectionResponseToJson(
   'id': instance.id,
   'name': instance.name,
   'status': _$EnrichedCollectionResponseStatusEnumMap[instance.status]!,
-  'updated_at': _$JsonConverterToJson<int, DateTime>(
+  'updated_at': _$JsonConverterToJson<Object, DateTime>(
     instance.updatedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/entity_creator_response.dart b/packages/stream_feeds/lib/src/generated/api/model/entity_creator_response.dart
index 56af4036..53ca5f73 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/entity_creator_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/entity_creator_response.dart
@@ -51,6 +51,7 @@ class EntityCreatorResponse with _$EntityCreatorResponse {
   final bool banned;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> blockedUserIds;
 
   @override
@@ -58,6 +59,7 @@ class EntityCreatorResponse with _$EntityCreatorResponse {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
@@ -101,6 +103,7 @@ class EntityCreatorResponse with _$EntityCreatorResponse {
   final String role;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> teams;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/entity_creator_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/entity_creator_response.g.dart
index 524e7fd4..0cce0664 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/entity_creator_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/entity_creator_response.g.dart
@@ -12,16 +12,16 @@ EntityCreatorResponse _$EntityCreatorResponseFromJson(
   avgResponseTime: (json['avg_response_time'] as num?)?.toInt(),
   banCount: (json['ban_count'] as num).toInt(),
   banned: json['banned'] as bool,
-  blockedUserIds: (json['blocked_user_ids'] as List<dynamic>).map((e) => e as String).toList(),
+  blockedUserIds: (json['blocked_user_ids'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
-  deactivatedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  deactivatedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deactivated_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -30,23 +30,23 @@ EntityCreatorResponse _$EntityCreatorResponseFromJson(
   id: json['id'] as String,
   image: json['image'] as String?,
   language: json['language'] as String,
-  lastActive: _$JsonConverterFromJson<int, DateTime>(
+  lastActive: _$JsonConverterFromJson<Object, DateTime>(
     json['last_active'],
     const EpochDateTimeConverter().fromJson,
   ),
   name: json['name'] as String?,
   online: json['online'] as bool,
-  revokeTokensIssuedBefore: _$JsonConverterFromJson<int, DateTime>(
+  revokeTokensIssuedBefore: _$JsonConverterFromJson<Object, DateTime>(
     json['revoke_tokens_issued_before'],
     const EpochDateTimeConverter().fromJson,
   ),
   role: json['role'] as String,
-  teams: (json['teams'] as List<dynamic>).map((e) => e as String).toList(),
+  teams: (json['teams'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   teamsRole: (json['teams_role'] as Map<String, dynamic>?)?.map(
     (k, e) => MapEntry(k, e as String),
   ),
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
 );
 
@@ -59,11 +59,11 @@ Map<String, dynamic> _$EntityCreatorResponseToJson(
   'blocked_user_ids': instance.blockedUserIds,
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'deactivated_at': _$JsonConverterToJson<int, DateTime>(
+  'deactivated_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deactivatedAt,
     const EpochDateTimeConverter().toJson,
   ),
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
@@ -72,13 +72,13 @@ Map<String, dynamic> _$EntityCreatorResponseToJson(
   'id': instance.id,
   'image': instance.image,
   'language': instance.language,
-  'last_active': _$JsonConverterToJson<int, DateTime>(
+  'last_active': _$JsonConverterToJson<Object, DateTime>(
     instance.lastActive,
     const EpochDateTimeConverter().toJson,
   ),
   'name': instance.name,
   'online': instance.online,
-  'revoke_tokens_issued_before': _$JsonConverterToJson<int, DateTime>(
+  'revoke_tokens_issued_before': _$JsonConverterToJson<Object, DateTime>(
     instance.revokeTokensIssuedBefore,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_created_event.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_created_event.dart
index 62af1487..df2ad522 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_created_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_created_event.dart
@@ -34,6 +34,7 @@ class FeedCreatedEvent extends core.WsEvent with _$FeedCreatedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
@@ -46,6 +47,7 @@ class FeedCreatedEvent extends core.WsEvent with _$FeedCreatedEvent {
   final String fid;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedMemberResponse> members;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_created_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_created_event.g.dart
index c9233eba..c7167587 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_created_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_created_event.g.dart
@@ -6,25 +6,27 @@ part of 'feed_created_event.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-FeedCreatedEvent _$FeedCreatedEventFromJson(Map<String, dynamic> json) => FeedCreatedEvent(
+FeedCreatedEvent _$FeedCreatedEventFromJson(
+  Map<String, dynamic> json,
+) => FeedCreatedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feed: FeedResponse.fromJson(json['feed'] as Map<String, dynamic>),
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
-  members: (json['members'] as List<dynamic>)
-      .map((e) => FeedMemberResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  members:
+      (json['members'] as List<dynamic>?)
+          ?.map((e) => FeedMemberResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
   type: json['type'] as String,
-  user: UserResponseCommonFields.fromJson(
-    json['user'] as Map<String, dynamic>,
-  ),
+  user: UserResponseCommonFields.fromJson(json['user'] as Map<String, dynamic>),
 );
 
 Map<String, dynamic> _$FeedCreatedEventToJson(FeedCreatedEvent instance) => <String, dynamic>{
@@ -34,7 +36,7 @@ Map<String, dynamic> _$FeedCreatedEventToJson(FeedCreatedEvent instance) => <Str
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'members': instance.members.map((e) => e.toJson()).toList(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_deleted_event.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_deleted_event.dart
index cc3052fe..edafa3c3 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_deleted_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_deleted_event.dart
@@ -32,6 +32,7 @@ class FeedDeletedEvent extends core.WsEvent with _$FeedDeletedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_deleted_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_deleted_event.g.dart
index e1833158..f5e59a77 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_deleted_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_deleted_event.g.dart
@@ -8,12 +8,12 @@ part of 'feed_deleted_event.dart';
 
 FeedDeletedEvent _$FeedDeletedEventFromJson(Map<String, dynamic> json) => FeedDeletedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -30,7 +30,7 @@ Map<String, dynamic> _$FeedDeletedEventToJson(FeedDeletedEvent instance) => <Str
   'custom': instance.custom,
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_group.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_group.dart
index c10530aa..93e3cebb 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_group.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_group.dart
@@ -41,9 +41,11 @@ class FeedGroup with _$FeedGroup {
   final ActivityFilterConfig? activityFilter;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ActivityProcessorConfig> activityProcessors;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ActivitySelectorConfig> activitySelectors;
 
   @override
@@ -60,6 +62,7 @@ class FeedGroup with _$FeedGroup {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_group.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_group.g.dart
index a3657345..13520850 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_group.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_group.g.dart
@@ -12,28 +12,36 @@ FeedGroup _$FeedGroupFromJson(Map<String, dynamic> json) => FeedGroup(
       : ActivityFilterConfig.fromJson(
           json['activity_filter'] as Map<String, dynamic>,
         ),
-  activityProcessors: (json['activity_processors'] as List<dynamic>)
-      .map((e) => ActivityProcessorConfig.fromJson(e as Map<String, dynamic>))
-      .toList(),
-  activitySelectors: (json['activity_selectors'] as List<dynamic>)
-      .map((e) => ActivitySelectorConfig.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  activityProcessors:
+      (json['activity_processors'] as List<dynamic>?)
+          ?.map(
+            (e) => ActivityProcessorConfig.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
+  activitySelectors:
+      (json['activity_selectors'] as List<dynamic>?)
+          ?.map(
+            (e) => ActivitySelectorConfig.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
   aggregation: json['aggregation'] == null
       ? null
       : AggregationConfig.fromJson(json['aggregation'] as Map<String, dynamic>),
   aggregationVersion: (json['aggregation_version'] as num).toInt(),
   appPk: (json['app_pk'] as num).toInt(),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   defaultVisibility: json['default_visibility'] as String,
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
   groupId: json['group_id'] as String,
-  lastFeedGetAt: _$JsonConverterFromJson<int, DateTime>(
+  lastFeedGetAt: _$JsonConverterFromJson<Object, DateTime>(
     json['last_feed_get_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -50,7 +58,7 @@ FeedGroup _$FeedGroupFromJson(Map<String, dynamic> json) => FeedGroup(
   ranking: json['ranking'] == null ? null : RankingConfig.fromJson(json['ranking'] as Map<String, dynamic>),
   stories: json['stories'] == null ? null : StoriesConfig.fromJson(json['stories'] as Map<String, dynamic>),
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
 );
 
@@ -64,12 +72,12 @@ Map<String, dynamic> _$FeedGroupToJson(FeedGroup instance) => <String, dynamic>{
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
   'default_visibility': instance.defaultVisibility,
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
   'group_id': instance.groupId,
-  'last_feed_get_at': _$JsonConverterToJson<int, DateTime>(
+  'last_feed_get_at': _$JsonConverterToJson<Object, DateTime>(
     instance.lastFeedGetAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_group_changed_event.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_group_changed_event.dart
index 4c5ba206..79824c55 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_group_changed_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_group_changed_event.dart
@@ -33,6 +33,7 @@ class FeedGroupChangedEvent extends core.WsEvent with _$FeedGroupChangedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_group_changed_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_group_changed_event.g.dart
index fd9e8adb..19241eb4 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_group_changed_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_group_changed_event.g.dart
@@ -10,13 +10,13 @@ FeedGroupChangedEvent _$FeedGroupChangedEventFromJson(
   Map<String, dynamic> json,
 ) => FeedGroupChangedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedGroup: json['feed_group'] == null ? null : FeedGroup.fromJson(json['feed_group'] as Map<String, dynamic>),
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -32,7 +32,7 @@ Map<String, dynamic> _$FeedGroupChangedEventToJson(
   'feed_group': instance.feedGroup?.toJson(),
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_group_deleted_event.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_group_deleted_event.dart
index ec4ed76d..febf92ff 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_group_deleted_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_group_deleted_event.dart
@@ -32,6 +32,7 @@ class FeedGroupDeletedEvent extends core.WsEvent with _$FeedGroupDeletedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_group_deleted_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_group_deleted_event.g.dart
index 88d6cad2..68b405d2 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_group_deleted_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_group_deleted_event.g.dart
@@ -10,13 +10,13 @@ FeedGroupDeletedEvent _$FeedGroupDeletedEventFromJson(
   Map<String, dynamic> json,
 ) => FeedGroupDeletedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   groupId: json['group_id'] as String,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -31,7 +31,7 @@ Map<String, dynamic> _$FeedGroupDeletedEventToJson(
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'group_id': instance.groupId,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_group_restored_event.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_group_restored_event.dart
index b2493308..d07eae97 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_group_restored_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_group_restored_event.dart
@@ -32,6 +32,7 @@ class FeedGroupRestoredEvent extends core.WsEvent with _$FeedGroupRestoredEvent
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_group_restored_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_group_restored_event.g.dart
index 0a716f5c..fa726c31 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_group_restored_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_group_restored_event.g.dart
@@ -10,13 +10,13 @@ FeedGroupRestoredEvent _$FeedGroupRestoredEventFromJson(
   Map<String, dynamic> json,
 ) => FeedGroupRestoredEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   groupId: json['group_id'] as String,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -31,7 +31,7 @@ Map<String, dynamic> _$FeedGroupRestoredEventToJson(
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'group_id': instance.groupId,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_member_added_event.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_member_added_event.dart
index a9b27b82..da06da35 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_member_added_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_member_added_event.dart
@@ -33,6 +33,7 @@ class FeedMemberAddedEvent extends core.WsEvent with _$FeedMemberAddedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_member_added_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_member_added_event.g.dart
index 8562405d..47e16f37 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_member_added_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_member_added_event.g.dart
@@ -10,13 +10,13 @@ FeedMemberAddedEvent _$FeedMemberAddedEventFromJson(
   Map<String, dynamic> json,
 ) => FeedMemberAddedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   member: FeedMemberResponse.fromJson(json['member'] as Map<String, dynamic>),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -32,7 +32,7 @@ Map<String, dynamic> _$FeedMemberAddedEventToJson(
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'member': instance.member.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_member_removed_event.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_member_removed_event.dart
index 06f18c01..c5a29462 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_member_removed_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_member_removed_event.dart
@@ -33,6 +33,7 @@ class FeedMemberRemovedEvent extends core.WsEvent with _$FeedMemberRemovedEvent
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_member_removed_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_member_removed_event.g.dart
index dd469324..43dfbe22 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_member_removed_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_member_removed_event.g.dart
@@ -10,13 +10,13 @@ FeedMemberRemovedEvent _$FeedMemberRemovedEventFromJson(
   Map<String, dynamic> json,
 ) => FeedMemberRemovedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   memberId: json['member_id'] as String,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -32,7 +32,7 @@ Map<String, dynamic> _$FeedMemberRemovedEventToJson(
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'member_id': instance.memberId,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_member_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_member_response.g.dart
index c54b71f0..3c65b0a3 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_member_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_member_response.g.dart
@@ -8,14 +8,14 @@ part of 'feed_member_response.dart';
 
 FeedMemberResponse _$FeedMemberResponseFromJson(Map<String, dynamic> json) => FeedMemberResponse(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   custom: json['custom'] as Map<String, dynamic>?,
-  inviteAcceptedAt: _$JsonConverterFromJson<int, DateTime>(
+  inviteAcceptedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['invite_accepted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  inviteRejectedAt: _$JsonConverterFromJson<int, DateTime>(
+  inviteRejectedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['invite_rejected_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -31,7 +31,7 @@ FeedMemberResponse _$FeedMemberResponseFromJson(Map<String, dynamic> json) => Fe
     unknownValue: FeedMemberResponseStatus.unknown,
   ),
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: UserResponse.fromJson(json['user'] as Map<String, dynamic>),
 );
@@ -39,11 +39,11 @@ FeedMemberResponse _$FeedMemberResponseFromJson(Map<String, dynamic> json) => Fe
 Map<String, dynamic> _$FeedMemberResponseToJson(FeedMemberResponse instance) => <String, dynamic>{
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'invite_accepted_at': _$JsonConverterToJson<int, DateTime>(
+  'invite_accepted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.inviteAcceptedAt,
     const EpochDateTimeConverter().toJson,
   ),
-  'invite_rejected_at': _$JsonConverterToJson<int, DateTime>(
+  'invite_rejected_at': _$JsonConverterToJson<Object, DateTime>(
     instance.inviteRejectedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_member_updated_event.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_member_updated_event.dart
index ead07867..1f915018 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_member_updated_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_member_updated_event.dart
@@ -33,6 +33,7 @@ class FeedMemberUpdatedEvent extends core.WsEvent with _$FeedMemberUpdatedEvent
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_member_updated_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_member_updated_event.g.dart
index 5727dcc7..377b311a 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_member_updated_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_member_updated_event.g.dart
@@ -10,13 +10,13 @@ FeedMemberUpdatedEvent _$FeedMemberUpdatedEventFromJson(
   Map<String, dynamic> json,
 ) => FeedMemberUpdatedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   member: FeedMemberResponse.fromJson(json['member'] as Map<String, dynamic>),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -32,7 +32,7 @@ Map<String, dynamic> _$FeedMemberUpdatedEventToJson(
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'member': instance.member.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_own_data.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_own_data.dart
index cc501159..baed6b79 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_own_data.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_own_data.dart
@@ -13,70 +13,6 @@ import '../models.dart';
 part 'feed_own_data.g.dart';
 part 'feed_own_data.freezed.dart';
 
-@JsonEnum(alwaysCreate: true)
-enum FeedOwnDataOwnCapabilities {
-  @JsonValue('add-activity')
-  addActivity,
-  @JsonValue('add-activity-bookmark')
-  addActivityBookmark,
-  @JsonValue('add-activity-reaction')
-  addActivityReaction,
-  @JsonValue('add-comment')
-  addComment,
-  @JsonValue('add-comment-reaction')
-  addCommentReaction,
-  @JsonValue('create-feed')
-  createFeed,
-  @JsonValue('delete-any-activity')
-  deleteAnyActivity,
-  @JsonValue('delete-any-comment')
-  deleteAnyComment,
-  @JsonValue('delete-feed')
-  deleteFeed,
-  @JsonValue('delete-own-activity')
-  deleteOwnActivity,
-  @JsonValue('delete-own-activity-bookmark')
-  deleteOwnActivityBookmark,
-  @JsonValue('delete-own-activity-reaction')
-  deleteOwnActivityReaction,
-  @JsonValue('delete-own-comment')
-  deleteOwnComment,
-  @JsonValue('delete-own-comment-reaction')
-  deleteOwnCommentReaction,
-  @JsonValue('follow')
-  follow,
-  @JsonValue('pin-activity')
-  pinActivity,
-  @JsonValue('query-feed-members')
-  queryFeedMembers,
-  @JsonValue('query-follows')
-  queryFollows,
-  @JsonValue('read-activities')
-  readActivities,
-  @JsonValue('read-feed')
-  readFeed,
-  @JsonValue('unfollow')
-  unfollow,
-  @JsonValue('update-any-activity')
-  updateAnyActivity,
-  @JsonValue('update-any-comment')
-  updateAnyComment,
-  @JsonValue('update-feed')
-  updateFeed,
-  @JsonValue('update-feed-followers')
-  updateFeedFollowers,
-  @JsonValue('update-feed-members')
-  updateFeedMembers,
-  @JsonValue('update-own-activity')
-  updateOwnActivity,
-  @JsonValue('update-own-activity-bookmark')
-  updateOwnActivityBookmark,
-  @JsonValue('update-own-comment')
-  updateOwnComment,
-  @JsonValue('_unknown')
-  unknown,
-}
-
 @freezed
 @immutable
 @JsonSerializable()
@@ -89,8 +25,8 @@ class FeedOwnData with _$FeedOwnData {
   });
 
   @override
-  @JsonKey(unknownEnumValue: FeedOwnDataOwnCapabilities.unknown)
-  final List<FeedOwnDataOwnCapabilities>? ownCapabilities;
+  @JsonKey(unknownEnumValue: FeedOwnCapability.unknown)
+  final List<FeedOwnCapability>? ownCapabilities;
 
   @override
   final List<FollowResponse>? ownFollowings;
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_own_data.freezed.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_own_data.freezed.dart
index 6fa89e28..14571c4f 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_own_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_own_data.freezed.dart
@@ -13,7 +13,7 @@ T _$identity<T>(T value) => value;
 
 /// @nodoc
 mixin _$FeedOwnData {
-  List<FeedOwnDataOwnCapabilities>? get ownCapabilities;
+  List<FeedOwnCapability>? get ownCapabilities;
   List<FollowResponse>? get ownFollowings;
   List<FollowResponse>? get ownFollows;
   FeedMemberResponse? get ownMembership;
@@ -68,7 +68,7 @@ abstract mixin class $FeedOwnDataCopyWith<$Res> {
   ) = _$FeedOwnDataCopyWithImpl;
   @useResult
   $Res call({
-    List<FeedOwnDataOwnCapabilities>? ownCapabilities,
+    List<FeedOwnCapability>? ownCapabilities,
     List<FollowResponse>? ownFollowings,
     List<FollowResponse>? ownFollows,
     FeedMemberResponse? ownMembership,
@@ -97,7 +97,7 @@ class _$FeedOwnDataCopyWithImpl<$Res> implements $FeedOwnDataCopyWith<$Res> {
         ownCapabilities: freezed == ownCapabilities
             ? _self.ownCapabilities
             : ownCapabilities // ignore: cast_nullable_to_non_nullable
-                  as List<FeedOwnDataOwnCapabilities>?,
+                  as List<FeedOwnCapability>?,
         ownFollowings: freezed == ownFollowings
             ? _self.ownFollowings
             : ownFollowings // ignore: cast_nullable_to_non_nullable
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_own_data.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_own_data.g.dart
index 47f58288..12e3e962 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_own_data.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_own_data.g.dart
@@ -10,9 +10,9 @@ FeedOwnData _$FeedOwnDataFromJson(Map<String, dynamic> json) => FeedOwnData(
   ownCapabilities: (json['own_capabilities'] as List<dynamic>?)
       ?.map(
         (e) => $enumDecode(
-          _$FeedOwnDataOwnCapabilitiesEnumMap,
+          _$FeedOwnCapabilityEnumMap,
           e,
-          unknownValue: FeedOwnDataOwnCapabilities.unknown,
+          unknownValue: FeedOwnCapability.unknown,
         ),
       )
       .toList(),
@@ -30,41 +30,41 @@ FeedOwnData _$FeedOwnDataFromJson(Map<String, dynamic> json) => FeedOwnData(
 );
 
 Map<String, dynamic> _$FeedOwnDataToJson(FeedOwnData instance) => <String, dynamic>{
-  'own_capabilities': instance.ownCapabilities?.map((e) => _$FeedOwnDataOwnCapabilitiesEnumMap[e]!).toList(),
+  'own_capabilities': instance.ownCapabilities?.map((e) => _$FeedOwnCapabilityEnumMap[e]!).toList(),
   'own_followings': instance.ownFollowings?.map((e) => e.toJson()).toList(),
   'own_follows': instance.ownFollows?.map((e) => e.toJson()).toList(),
   'own_membership': instance.ownMembership?.toJson(),
 };
 
-const _$FeedOwnDataOwnCapabilitiesEnumMap = {
-  FeedOwnDataOwnCapabilities.addActivity: 'add-activity',
-  FeedOwnDataOwnCapabilities.addActivityBookmark: 'add-activity-bookmark',
-  FeedOwnDataOwnCapabilities.addActivityReaction: 'add-activity-reaction',
-  FeedOwnDataOwnCapabilities.addComment: 'add-comment',
-  FeedOwnDataOwnCapabilities.addCommentReaction: 'add-comment-reaction',
-  FeedOwnDataOwnCapabilities.createFeed: 'create-feed',
-  FeedOwnDataOwnCapabilities.deleteAnyActivity: 'delete-any-activity',
-  FeedOwnDataOwnCapabilities.deleteAnyComment: 'delete-any-comment',
-  FeedOwnDataOwnCapabilities.deleteFeed: 'delete-feed',
-  FeedOwnDataOwnCapabilities.deleteOwnActivity: 'delete-own-activity',
-  FeedOwnDataOwnCapabilities.deleteOwnActivityBookmark: 'delete-own-activity-bookmark',
-  FeedOwnDataOwnCapabilities.deleteOwnActivityReaction: 'delete-own-activity-reaction',
-  FeedOwnDataOwnCapabilities.deleteOwnComment: 'delete-own-comment',
-  FeedOwnDataOwnCapabilities.deleteOwnCommentReaction: 'delete-own-comment-reaction',
-  FeedOwnDataOwnCapabilities.follow: 'follow',
-  FeedOwnDataOwnCapabilities.pinActivity: 'pin-activity',
-  FeedOwnDataOwnCapabilities.queryFeedMembers: 'query-feed-members',
-  FeedOwnDataOwnCapabilities.queryFollows: 'query-follows',
-  FeedOwnDataOwnCapabilities.readActivities: 'read-activities',
-  FeedOwnDataOwnCapabilities.readFeed: 'read-feed',
-  FeedOwnDataOwnCapabilities.unfollow: 'unfollow',
-  FeedOwnDataOwnCapabilities.updateAnyActivity: 'update-any-activity',
-  FeedOwnDataOwnCapabilities.updateAnyComment: 'update-any-comment',
-  FeedOwnDataOwnCapabilities.updateFeed: 'update-feed',
-  FeedOwnDataOwnCapabilities.updateFeedFollowers: 'update-feed-followers',
-  FeedOwnDataOwnCapabilities.updateFeedMembers: 'update-feed-members',
-  FeedOwnDataOwnCapabilities.updateOwnActivity: 'update-own-activity',
-  FeedOwnDataOwnCapabilities.updateOwnActivityBookmark: 'update-own-activity-bookmark',
-  FeedOwnDataOwnCapabilities.updateOwnComment: 'update-own-comment',
-  FeedOwnDataOwnCapabilities.unknown: '_unknown',
+const _$FeedOwnCapabilityEnumMap = {
+  FeedOwnCapability.addActivity: 'add-activity',
+  FeedOwnCapability.addActivityBookmark: 'add-activity-bookmark',
+  FeedOwnCapability.addActivityReaction: 'add-activity-reaction',
+  FeedOwnCapability.addComment: 'add-comment',
+  FeedOwnCapability.addCommentReaction: 'add-comment-reaction',
+  FeedOwnCapability.createFeed: 'create-feed',
+  FeedOwnCapability.deleteAnyActivity: 'delete-any-activity',
+  FeedOwnCapability.deleteAnyComment: 'delete-any-comment',
+  FeedOwnCapability.deleteFeed: 'delete-feed',
+  FeedOwnCapability.deleteOwnActivity: 'delete-own-activity',
+  FeedOwnCapability.deleteOwnActivityBookmark: 'delete-own-activity-bookmark',
+  FeedOwnCapability.deleteOwnActivityReaction: 'delete-own-activity-reaction',
+  FeedOwnCapability.deleteOwnComment: 'delete-own-comment',
+  FeedOwnCapability.deleteOwnCommentReaction: 'delete-own-comment-reaction',
+  FeedOwnCapability.follow: 'follow',
+  FeedOwnCapability.pinActivity: 'pin-activity',
+  FeedOwnCapability.queryFeedMembers: 'query-feed-members',
+  FeedOwnCapability.queryFollows: 'query-follows',
+  FeedOwnCapability.readActivities: 'read-activities',
+  FeedOwnCapability.readFeed: 'read-feed',
+  FeedOwnCapability.unfollow: 'unfollow',
+  FeedOwnCapability.updateAnyActivity: 'update-any-activity',
+  FeedOwnCapability.updateAnyComment: 'update-any-comment',
+  FeedOwnCapability.updateFeed: 'update-feed',
+  FeedOwnCapability.updateFeedFollowers: 'update-feed-followers',
+  FeedOwnCapability.updateFeedMembers: 'update-feed-members',
+  FeedOwnCapability.updateOwnActivity: 'update-own-activity',
+  FeedOwnCapability.updateOwnActivityBookmark: 'update-own-activity-bookmark',
+  FeedOwnCapability.updateOwnComment: 'update-own-comment',
+  FeedOwnCapability.unknown: '_unknown',
 };
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_response.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_response.dart
index 5ee749f2..649505f6 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_response.dart
@@ -13,70 +13,6 @@ import '../models.dart';
 part 'feed_response.g.dart';
 part 'feed_response.freezed.dart';
 
-@JsonEnum(alwaysCreate: true)
-enum FeedResponseOwnCapabilities {
-  @JsonValue('add-activity')
-  addActivity,
-  @JsonValue('add-activity-bookmark')
-  addActivityBookmark,
-  @JsonValue('add-activity-reaction')
-  addActivityReaction,
-  @JsonValue('add-comment')
-  addComment,
-  @JsonValue('add-comment-reaction')
-  addCommentReaction,
-  @JsonValue('create-feed')
-  createFeed,
-  @JsonValue('delete-any-activity')
-  deleteAnyActivity,
-  @JsonValue('delete-any-comment')
-  deleteAnyComment,
-  @JsonValue('delete-feed')
-  deleteFeed,
-  @JsonValue('delete-own-activity')
-  deleteOwnActivity,
-  @JsonValue('delete-own-activity-bookmark')
-  deleteOwnActivityBookmark,
-  @JsonValue('delete-own-activity-reaction')
-  deleteOwnActivityReaction,
-  @JsonValue('delete-own-comment')
-  deleteOwnComment,
-  @JsonValue('delete-own-comment-reaction')
-  deleteOwnCommentReaction,
-  @JsonValue('follow')
-  follow,
-  @JsonValue('pin-activity')
-  pinActivity,
-  @JsonValue('query-feed-members')
-  queryFeedMembers,
-  @JsonValue('query-follows')
-  queryFollows,
-  @JsonValue('read-activities')
-  readActivities,
-  @JsonValue('read-feed')
-  readFeed,
-  @JsonValue('unfollow')
-  unfollow,
-  @JsonValue('update-any-activity')
-  updateAnyActivity,
-  @JsonValue('update-any-comment')
-  updateAnyComment,
-  @JsonValue('update-feed')
-  updateFeed,
-  @JsonValue('update-feed-followers')
-  updateFeedFollowers,
-  @JsonValue('update-feed-members')
-  updateFeedMembers,
-  @JsonValue('update-own-activity')
-  updateOwnActivity,
-  @JsonValue('update-own-activity-bookmark')
-  updateOwnActivityBookmark,
-  @JsonValue('update-own-comment')
-  updateOwnComment,
-  @JsonValue('_unknown')
-  unknown,
-}
-
 @JsonEnum(alwaysCreate: true)
 enum FeedResponseVisibility {
   @JsonValue('followers')
@@ -170,8 +106,8 @@ class FeedResponse with _$FeedResponse {
   final String name;
 
   @override
-  @JsonKey(unknownEnumValue: FeedResponseOwnCapabilities.unknown)
-  final List<FeedResponseOwnCapabilities>? ownCapabilities;
+  @JsonKey(unknownEnumValue: FeedOwnCapability.unknown)
+  final List<FeedOwnCapability>? ownCapabilities;
 
   @override
   final List<FollowResponse>? ownFollowings;
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_response.freezed.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_response.freezed.dart
index 588d06c2..203d9f99 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_response.freezed.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_response.freezed.dart
@@ -28,7 +28,7 @@ mixin _$FeedResponse {
   Location? get location;
   int get memberCount;
   String get name;
-  List<FeedResponseOwnCapabilities>? get ownCapabilities;
+  List<FeedOwnCapability>? get ownCapabilities;
   List<FollowResponse>? get ownFollowings;
   List<FollowResponse>? get ownFollows;
   FeedMemberResponse? get ownMembership;
@@ -142,7 +142,7 @@ abstract mixin class $FeedResponseCopyWith<$Res> {
     Location? location,
     int memberCount,
     String name,
-    List<FeedResponseOwnCapabilities>? ownCapabilities,
+    List<FeedOwnCapability>? ownCapabilities,
     List<FollowResponse>? ownFollowings,
     List<FollowResponse>? ownFollows,
     FeedMemberResponse? ownMembership,
@@ -252,7 +252,7 @@ class _$FeedResponseCopyWithImpl<$Res> implements $FeedResponseCopyWith<$Res> {
         ownCapabilities: freezed == ownCapabilities
             ? _self.ownCapabilities
             : ownCapabilities // ignore: cast_nullable_to_non_nullable
-                  as List<FeedResponseOwnCapabilities>?,
+                  as List<FeedOwnCapability>?,
         ownFollowings: freezed == ownFollowings
             ? _self.ownFollowings
             : ownFollowings // ignore: cast_nullable_to_non_nullable
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_response.g.dart
index 6cda1895..a25085a9 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_response.g.dart
@@ -9,11 +9,11 @@ part of 'feed_response.dart';
 FeedResponse _$FeedResponseFromJson(Map<String, dynamic> json) => FeedResponse(
   activityCount: (json['activity_count'] as num).toInt(),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   createdBy: UserResponse.fromJson(json['created_by'] as Map<String, dynamic>),
   custom: json['custom'] as Map<String, dynamic>?,
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -30,9 +30,9 @@ FeedResponse _$FeedResponseFromJson(Map<String, dynamic> json) => FeedResponse(
   ownCapabilities: (json['own_capabilities'] as List<dynamic>?)
       ?.map(
         (e) => $enumDecode(
-          _$FeedResponseOwnCapabilitiesEnumMap,
+          _$FeedOwnCapabilityEnumMap,
           e,
-          unknownValue: FeedResponseOwnCapabilities.unknown,
+          unknownValue: FeedOwnCapability.unknown,
         ),
       )
       .toList(),
@@ -49,7 +49,7 @@ FeedResponse _$FeedResponseFromJson(Map<String, dynamic> json) => FeedResponse(
         ),
   pinCount: (json['pin_count'] as num).toInt(),
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   visibility: $enumDecodeNullable(
     _$FeedResponseVisibilityEnumMap,
@@ -63,7 +63,7 @@ Map<String, dynamic> _$FeedResponseToJson(FeedResponse instance) => <String, dyn
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'created_by': instance.createdBy.toJson(),
   'custom': instance.custom,
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
@@ -77,7 +77,7 @@ Map<String, dynamic> _$FeedResponseToJson(FeedResponse instance) => <String, dyn
   'location': instance.location?.toJson(),
   'member_count': instance.memberCount,
   'name': instance.name,
-  'own_capabilities': instance.ownCapabilities?.map((e) => _$FeedResponseOwnCapabilitiesEnumMap[e]!).toList(),
+  'own_capabilities': instance.ownCapabilities?.map((e) => _$FeedOwnCapabilityEnumMap[e]!).toList(),
   'own_followings': instance.ownFollowings?.map((e) => e.toJson()).toList(),
   'own_follows': instance.ownFollows?.map((e) => e.toJson()).toList(),
   'own_membership': instance.ownMembership?.toJson(),
@@ -91,37 +91,37 @@ Value? _$JsonConverterFromJson<Json, Value>(
   Value? Function(Json json) fromJson,
 ) => json == null ? null : fromJson(json as Json);
 
-const _$FeedResponseOwnCapabilitiesEnumMap = {
-  FeedResponseOwnCapabilities.addActivity: 'add-activity',
-  FeedResponseOwnCapabilities.addActivityBookmark: 'add-activity-bookmark',
-  FeedResponseOwnCapabilities.addActivityReaction: 'add-activity-reaction',
-  FeedResponseOwnCapabilities.addComment: 'add-comment',
-  FeedResponseOwnCapabilities.addCommentReaction: 'add-comment-reaction',
-  FeedResponseOwnCapabilities.createFeed: 'create-feed',
-  FeedResponseOwnCapabilities.deleteAnyActivity: 'delete-any-activity',
-  FeedResponseOwnCapabilities.deleteAnyComment: 'delete-any-comment',
-  FeedResponseOwnCapabilities.deleteFeed: 'delete-feed',
-  FeedResponseOwnCapabilities.deleteOwnActivity: 'delete-own-activity',
-  FeedResponseOwnCapabilities.deleteOwnActivityBookmark: 'delete-own-activity-bookmark',
-  FeedResponseOwnCapabilities.deleteOwnActivityReaction: 'delete-own-activity-reaction',
-  FeedResponseOwnCapabilities.deleteOwnComment: 'delete-own-comment',
-  FeedResponseOwnCapabilities.deleteOwnCommentReaction: 'delete-own-comment-reaction',
-  FeedResponseOwnCapabilities.follow: 'follow',
-  FeedResponseOwnCapabilities.pinActivity: 'pin-activity',
-  FeedResponseOwnCapabilities.queryFeedMembers: 'query-feed-members',
-  FeedResponseOwnCapabilities.queryFollows: 'query-follows',
-  FeedResponseOwnCapabilities.readActivities: 'read-activities',
-  FeedResponseOwnCapabilities.readFeed: 'read-feed',
-  FeedResponseOwnCapabilities.unfollow: 'unfollow',
-  FeedResponseOwnCapabilities.updateAnyActivity: 'update-any-activity',
-  FeedResponseOwnCapabilities.updateAnyComment: 'update-any-comment',
-  FeedResponseOwnCapabilities.updateFeed: 'update-feed',
-  FeedResponseOwnCapabilities.updateFeedFollowers: 'update-feed-followers',
-  FeedResponseOwnCapabilities.updateFeedMembers: 'update-feed-members',
-  FeedResponseOwnCapabilities.updateOwnActivity: 'update-own-activity',
-  FeedResponseOwnCapabilities.updateOwnActivityBookmark: 'update-own-activity-bookmark',
-  FeedResponseOwnCapabilities.updateOwnComment: 'update-own-comment',
-  FeedResponseOwnCapabilities.unknown: '_unknown',
+const _$FeedOwnCapabilityEnumMap = {
+  FeedOwnCapability.addActivity: 'add-activity',
+  FeedOwnCapability.addActivityBookmark: 'add-activity-bookmark',
+  FeedOwnCapability.addActivityReaction: 'add-activity-reaction',
+  FeedOwnCapability.addComment: 'add-comment',
+  FeedOwnCapability.addCommentReaction: 'add-comment-reaction',
+  FeedOwnCapability.createFeed: 'create-feed',
+  FeedOwnCapability.deleteAnyActivity: 'delete-any-activity',
+  FeedOwnCapability.deleteAnyComment: 'delete-any-comment',
+  FeedOwnCapability.deleteFeed: 'delete-feed',
+  FeedOwnCapability.deleteOwnActivity: 'delete-own-activity',
+  FeedOwnCapability.deleteOwnActivityBookmark: 'delete-own-activity-bookmark',
+  FeedOwnCapability.deleteOwnActivityReaction: 'delete-own-activity-reaction',
+  FeedOwnCapability.deleteOwnComment: 'delete-own-comment',
+  FeedOwnCapability.deleteOwnCommentReaction: 'delete-own-comment-reaction',
+  FeedOwnCapability.follow: 'follow',
+  FeedOwnCapability.pinActivity: 'pin-activity',
+  FeedOwnCapability.queryFeedMembers: 'query-feed-members',
+  FeedOwnCapability.queryFollows: 'query-follows',
+  FeedOwnCapability.readActivities: 'read-activities',
+  FeedOwnCapability.readFeed: 'read-feed',
+  FeedOwnCapability.unfollow: 'unfollow',
+  FeedOwnCapability.updateAnyActivity: 'update-any-activity',
+  FeedOwnCapability.updateAnyComment: 'update-any-comment',
+  FeedOwnCapability.updateFeed: 'update-feed',
+  FeedOwnCapability.updateFeedFollowers: 'update-feed-followers',
+  FeedOwnCapability.updateFeedMembers: 'update-feed-members',
+  FeedOwnCapability.updateOwnActivity: 'update-own-activity',
+  FeedOwnCapability.updateOwnActivityBookmark: 'update-own-activity-bookmark',
+  FeedOwnCapability.updateOwnComment: 'update-own-comment',
+  FeedOwnCapability.unknown: '_unknown',
 };
 
 const _$FeedResponseVisibilityEnumMap = {
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_suggestion_response.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_suggestion_response.dart
index f4f00280..32e31760 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_suggestion_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_suggestion_response.dart
@@ -13,70 +13,6 @@ import '../models.dart';
 part 'feed_suggestion_response.g.dart';
 part 'feed_suggestion_response.freezed.dart';
 
-@JsonEnum(alwaysCreate: true)
-enum FeedSuggestionResponseOwnCapabilities {
-  @JsonValue('add-activity')
-  addActivity,
-  @JsonValue('add-activity-bookmark')
-  addActivityBookmark,
-  @JsonValue('add-activity-reaction')
-  addActivityReaction,
-  @JsonValue('add-comment')
-  addComment,
-  @JsonValue('add-comment-reaction')
-  addCommentReaction,
-  @JsonValue('create-feed')
-  createFeed,
-  @JsonValue('delete-any-activity')
-  deleteAnyActivity,
-  @JsonValue('delete-any-comment')
-  deleteAnyComment,
-  @JsonValue('delete-feed')
-  deleteFeed,
-  @JsonValue('delete-own-activity')
-  deleteOwnActivity,
-  @JsonValue('delete-own-activity-bookmark')
-  deleteOwnActivityBookmark,
-  @JsonValue('delete-own-activity-reaction')
-  deleteOwnActivityReaction,
-  @JsonValue('delete-own-comment')
-  deleteOwnComment,
-  @JsonValue('delete-own-comment-reaction')
-  deleteOwnCommentReaction,
-  @JsonValue('follow')
-  follow,
-  @JsonValue('pin-activity')
-  pinActivity,
-  @JsonValue('query-feed-members')
-  queryFeedMembers,
-  @JsonValue('query-follows')
-  queryFollows,
-  @JsonValue('read-activities')
-  readActivities,
-  @JsonValue('read-feed')
-  readFeed,
-  @JsonValue('unfollow')
-  unfollow,
-  @JsonValue('update-any-activity')
-  updateAnyActivity,
-  @JsonValue('update-any-comment')
-  updateAnyComment,
-  @JsonValue('update-feed')
-  updateFeed,
-  @JsonValue('update-feed-followers')
-  updateFeedFollowers,
-  @JsonValue('update-feed-members')
-  updateFeedMembers,
-  @JsonValue('update-own-activity')
-  updateOwnActivity,
-  @JsonValue('update-own-activity-bookmark')
-  updateOwnActivityBookmark,
-  @JsonValue('update-own-comment')
-  updateOwnComment,
-  @JsonValue('_unknown')
-  unknown,
-}
-
 @JsonEnum(alwaysCreate: true)
 enum FeedSuggestionResponseVisibility {
   @JsonValue('followers')
@@ -176,8 +112,8 @@ class FeedSuggestionResponse with _$FeedSuggestionResponse {
   final String name;
 
   @override
-  @JsonKey(unknownEnumValue: FeedSuggestionResponseOwnCapabilities.unknown)
-  final List<FeedSuggestionResponseOwnCapabilities>? ownCapabilities;
+  @JsonKey(unknownEnumValue: FeedOwnCapability.unknown)
+  final List<FeedOwnCapability>? ownCapabilities;
 
   @override
   final List<FollowResponse>? ownFollowings;
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_suggestion_response.freezed.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_suggestion_response.freezed.dart
index aca3572d..1d7e93ba 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_suggestion_response.freezed.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_suggestion_response.freezed.dart
@@ -29,7 +29,7 @@ mixin _$FeedSuggestionResponse {
   Location? get location;
   int get memberCount;
   String get name;
-  List<FeedSuggestionResponseOwnCapabilities>? get ownCapabilities;
+  List<FeedOwnCapability>? get ownCapabilities;
   List<FollowResponse>? get ownFollowings;
   List<FollowResponse>? get ownFollows;
   FeedMemberResponse? get ownMembership;
@@ -157,7 +157,7 @@ abstract mixin class $FeedSuggestionResponseCopyWith<$Res> {
     Location? location,
     int memberCount,
     String name,
-    List<FeedSuggestionResponseOwnCapabilities>? ownCapabilities,
+    List<FeedOwnCapability>? ownCapabilities,
     List<FollowResponse>? ownFollowings,
     List<FollowResponse>? ownFollows,
     FeedMemberResponse? ownMembership,
@@ -276,7 +276,7 @@ class _$FeedSuggestionResponseCopyWithImpl<$Res> implements $FeedSuggestionRespo
         ownCapabilities: freezed == ownCapabilities
             ? _self.ownCapabilities
             : ownCapabilities // ignore: cast_nullable_to_non_nullable
-                  as List<FeedSuggestionResponseOwnCapabilities>?,
+                  as List<FeedOwnCapability>?,
         ownFollowings: freezed == ownFollowings
             ? _self.ownFollowings
             : ownFollowings // ignore: cast_nullable_to_non_nullable
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_suggestion_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_suggestion_response.g.dart
index 9e9c500a..e718e413 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_suggestion_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_suggestion_response.g.dart
@@ -14,11 +14,11 @@ FeedSuggestionResponse _$FeedSuggestionResponseFromJson(
     (k, e) => MapEntry(k, (e as num).toDouble()),
   ),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   createdBy: UserResponse.fromJson(json['created_by'] as Map<String, dynamic>),
   custom: json['custom'] as Map<String, dynamic>?,
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -35,9 +35,9 @@ FeedSuggestionResponse _$FeedSuggestionResponseFromJson(
   ownCapabilities: (json['own_capabilities'] as List<dynamic>?)
       ?.map(
         (e) => $enumDecode(
-          _$FeedSuggestionResponseOwnCapabilitiesEnumMap,
+          _$FeedOwnCapabilityEnumMap,
           e,
-          unknownValue: FeedSuggestionResponseOwnCapabilities.unknown,
+          unknownValue: FeedOwnCapability.unknown,
         ),
       )
       .toList(),
@@ -56,7 +56,7 @@ FeedSuggestionResponse _$FeedSuggestionResponseFromJson(
   reason: json['reason'] as String?,
   recommendationScore: (json['recommendation_score'] as num?)?.toDouble(),
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   visibility: $enumDecodeNullable(
     _$FeedSuggestionResponseVisibilityEnumMap,
@@ -73,7 +73,7 @@ Map<String, dynamic> _$FeedSuggestionResponseToJson(
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'created_by': instance.createdBy.toJson(),
   'custom': instance.custom,
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
@@ -87,7 +87,7 @@ Map<String, dynamic> _$FeedSuggestionResponseToJson(
   'location': instance.location?.toJson(),
   'member_count': instance.memberCount,
   'name': instance.name,
-  'own_capabilities': instance.ownCapabilities?.map((e) => _$FeedSuggestionResponseOwnCapabilitiesEnumMap[e]!).toList(),
+  'own_capabilities': instance.ownCapabilities?.map((e) => _$FeedOwnCapabilityEnumMap[e]!).toList(),
   'own_followings': instance.ownFollowings?.map((e) => e.toJson()).toList(),
   'own_follows': instance.ownFollows?.map((e) => e.toJson()).toList(),
   'own_membership': instance.ownMembership?.toJson(),
@@ -103,37 +103,37 @@ Value? _$JsonConverterFromJson<Json, Value>(
   Value? Function(Json json) fromJson,
 ) => json == null ? null : fromJson(json as Json);
 
-const _$FeedSuggestionResponseOwnCapabilitiesEnumMap = {
-  FeedSuggestionResponseOwnCapabilities.addActivity: 'add-activity',
-  FeedSuggestionResponseOwnCapabilities.addActivityBookmark: 'add-activity-bookmark',
-  FeedSuggestionResponseOwnCapabilities.addActivityReaction: 'add-activity-reaction',
-  FeedSuggestionResponseOwnCapabilities.addComment: 'add-comment',
-  FeedSuggestionResponseOwnCapabilities.addCommentReaction: 'add-comment-reaction',
-  FeedSuggestionResponseOwnCapabilities.createFeed: 'create-feed',
-  FeedSuggestionResponseOwnCapabilities.deleteAnyActivity: 'delete-any-activity',
-  FeedSuggestionResponseOwnCapabilities.deleteAnyComment: 'delete-any-comment',
-  FeedSuggestionResponseOwnCapabilities.deleteFeed: 'delete-feed',
-  FeedSuggestionResponseOwnCapabilities.deleteOwnActivity: 'delete-own-activity',
-  FeedSuggestionResponseOwnCapabilities.deleteOwnActivityBookmark: 'delete-own-activity-bookmark',
-  FeedSuggestionResponseOwnCapabilities.deleteOwnActivityReaction: 'delete-own-activity-reaction',
-  FeedSuggestionResponseOwnCapabilities.deleteOwnComment: 'delete-own-comment',
-  FeedSuggestionResponseOwnCapabilities.deleteOwnCommentReaction: 'delete-own-comment-reaction',
-  FeedSuggestionResponseOwnCapabilities.follow: 'follow',
-  FeedSuggestionResponseOwnCapabilities.pinActivity: 'pin-activity',
-  FeedSuggestionResponseOwnCapabilities.queryFeedMembers: 'query-feed-members',
-  FeedSuggestionResponseOwnCapabilities.queryFollows: 'query-follows',
-  FeedSuggestionResponseOwnCapabilities.readActivities: 'read-activities',
-  FeedSuggestionResponseOwnCapabilities.readFeed: 'read-feed',
-  FeedSuggestionResponseOwnCapabilities.unfollow: 'unfollow',
-  FeedSuggestionResponseOwnCapabilities.updateAnyActivity: 'update-any-activity',
-  FeedSuggestionResponseOwnCapabilities.updateAnyComment: 'update-any-comment',
-  FeedSuggestionResponseOwnCapabilities.updateFeed: 'update-feed',
-  FeedSuggestionResponseOwnCapabilities.updateFeedFollowers: 'update-feed-followers',
-  FeedSuggestionResponseOwnCapabilities.updateFeedMembers: 'update-feed-members',
-  FeedSuggestionResponseOwnCapabilities.updateOwnActivity: 'update-own-activity',
-  FeedSuggestionResponseOwnCapabilities.updateOwnActivityBookmark: 'update-own-activity-bookmark',
-  FeedSuggestionResponseOwnCapabilities.updateOwnComment: 'update-own-comment',
-  FeedSuggestionResponseOwnCapabilities.unknown: '_unknown',
+const _$FeedOwnCapabilityEnumMap = {
+  FeedOwnCapability.addActivity: 'add-activity',
+  FeedOwnCapability.addActivityBookmark: 'add-activity-bookmark',
+  FeedOwnCapability.addActivityReaction: 'add-activity-reaction',
+  FeedOwnCapability.addComment: 'add-comment',
+  FeedOwnCapability.addCommentReaction: 'add-comment-reaction',
+  FeedOwnCapability.createFeed: 'create-feed',
+  FeedOwnCapability.deleteAnyActivity: 'delete-any-activity',
+  FeedOwnCapability.deleteAnyComment: 'delete-any-comment',
+  FeedOwnCapability.deleteFeed: 'delete-feed',
+  FeedOwnCapability.deleteOwnActivity: 'delete-own-activity',
+  FeedOwnCapability.deleteOwnActivityBookmark: 'delete-own-activity-bookmark',
+  FeedOwnCapability.deleteOwnActivityReaction: 'delete-own-activity-reaction',
+  FeedOwnCapability.deleteOwnComment: 'delete-own-comment',
+  FeedOwnCapability.deleteOwnCommentReaction: 'delete-own-comment-reaction',
+  FeedOwnCapability.follow: 'follow',
+  FeedOwnCapability.pinActivity: 'pin-activity',
+  FeedOwnCapability.queryFeedMembers: 'query-feed-members',
+  FeedOwnCapability.queryFollows: 'query-follows',
+  FeedOwnCapability.readActivities: 'read-activities',
+  FeedOwnCapability.readFeed: 'read-feed',
+  FeedOwnCapability.unfollow: 'unfollow',
+  FeedOwnCapability.updateAnyActivity: 'update-any-activity',
+  FeedOwnCapability.updateAnyComment: 'update-any-comment',
+  FeedOwnCapability.updateFeed: 'update-feed',
+  FeedOwnCapability.updateFeedFollowers: 'update-feed-followers',
+  FeedOwnCapability.updateFeedMembers: 'update-feed-members',
+  FeedOwnCapability.updateOwnActivity: 'update-own-activity',
+  FeedOwnCapability.updateOwnActivityBookmark: 'update-own-activity-bookmark',
+  FeedOwnCapability.updateOwnComment: 'update-own-comment',
+  FeedOwnCapability.unknown: '_unknown',
 };
 
 const _$FeedSuggestionResponseVisibilityEnumMap = {
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_updated_event.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_updated_event.dart
index 1dec9227..dead2bec 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_updated_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_updated_event.dart
@@ -33,6 +33,7 @@ class FeedUpdatedEvent extends core.WsEvent with _$FeedUpdatedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feed_updated_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feed_updated_event.g.dart
index c60ed2d1..ef6e9bf5 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feed_updated_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feed_updated_event.g.dart
@@ -8,13 +8,13 @@ part of 'feed_updated_event.dart';
 
 FeedUpdatedEvent _$FeedUpdatedEventFromJson(Map<String, dynamic> json) => FeedUpdatedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feed: FeedResponse.fromJson(json['feed'] as Map<String, dynamic>),
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -32,7 +32,7 @@ Map<String, dynamic> _$FeedUpdatedEventToJson(FeedUpdatedEvent instance) => <Str
   'feed': instance.feed.toJson(),
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feeds_bookmark_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feeds_bookmark_response.g.dart
index cc0d19e2..9b964226 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feeds_bookmark_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feeds_bookmark_response.g.dart
@@ -11,13 +11,13 @@ FeedsBookmarkResponse _$FeedsBookmarkResponseFromJson(
 ) => FeedsBookmarkResponse(
   activityId: json['activity_id'] as String?,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   custom: json['custom'] as Map<String, dynamic>?,
   objectId: json['object_id'] as String,
   objectType: json['object_type'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: UserResponse.fromJson(json['user'] as Map<String, dynamic>),
 );
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feeds_enriched_collection_response.dart b/packages/stream_feeds/lib/src/generated/api/model/feeds_enriched_collection_response.dart
index 8c3da9a4..76a592b8 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feeds_enriched_collection_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feeds_enriched_collection_response.dart
@@ -32,6 +32,7 @@ class FeedsEnrichedCollectionResponse with _$FeedsEnrichedCollectionResponse {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feeds_enriched_collection_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feeds_enriched_collection_response.g.dart
index d337a255..ea87650e 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feeds_enriched_collection_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feeds_enriched_collection_response.g.dart
@@ -10,14 +10,14 @@ FeedsEnrichedCollectionResponse _$FeedsEnrichedCollectionResponseFromJson(
   Map<String, dynamic> json,
 ) => FeedsEnrichedCollectionResponse(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   id: json['id'] as String,
   name: json['name'] as String,
   status: json['status'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   userId: json['user_id'] as String,
 );
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feeds_feed_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feeds_feed_response.g.dart
index d9c89260..9b55c25f 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feeds_feed_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feeds_feed_response.g.dart
@@ -9,13 +9,13 @@ part of 'feeds_feed_response.dart';
 FeedsFeedResponse _$FeedsFeedResponseFromJson(Map<String, dynamic> json) => FeedsFeedResponse(
   activityCount: (json['activity_count'] as num).toInt(),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   createdBy: UserResponse.fromJson(
     json['created_by'] as Map<String, dynamic>,
   ),
   custom: json['custom'] as Map<String, dynamic>?,
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -35,7 +35,7 @@ FeedsFeedResponse _$FeedsFeedResponseFromJson(Map<String, dynamic> json) => Feed
   name: json['name'] as String,
   pinCount: (json['pin_count'] as num).toInt(),
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   visibility: json['visibility'] as String?,
 );
@@ -45,7 +45,7 @@ Map<String, dynamic> _$FeedsFeedResponseToJson(FeedsFeedResponse instance) => <S
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'created_by': instance.createdBy.toJson(),
   'custom': instance.custom,
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feeds_reaction_group_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feeds_reaction_group_response.g.dart
index 6101c3e6..bcb00813 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feeds_reaction_group_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feeds_reaction_group_response.g.dart
@@ -11,10 +11,10 @@ FeedsReactionGroupResponse _$FeedsReactionGroupResponseFromJson(
 ) => FeedsReactionGroupResponse(
   count: (json['count'] as num).toInt(),
   firstReactionAt: const EpochDateTimeConverter().fromJson(
-    (json['first_reaction_at'] as num).toInt(),
+    json['first_reaction_at'] as Object,
   ),
   lastReactionAt: const EpochDateTimeConverter().fromJson(
-    (json['last_reaction_at'] as num).toInt(),
+    json['last_reaction_at'] as Object,
   ),
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feeds_reaction_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feeds_reaction_response.g.dart
index 702fd151..f19e5cf4 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feeds_reaction_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feeds_reaction_response.g.dart
@@ -12,12 +12,12 @@ FeedsReactionResponse _$FeedsReactionResponseFromJson(
   activityId: json['activity_id'] as String,
   commentId: json['comment_id'] as String?,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   custom: json['custom'] as Map<String, dynamic>?,
   type: json['type'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: UserResponse.fromJson(json['user'] as Map<String, dynamic>),
 );
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feeds_v3_activity_response.dart b/packages/stream_feeds/lib/src/generated/api/model/feeds_v3_activity_response.dart
index 3fb5a071..da0595de 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feeds_v3_activity_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feeds_v3_activity_response.dart
@@ -69,18 +69,21 @@ class FeedsV3ActivityResponse with _$FeedsV3ActivityResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<Attachment> attachments;
 
   @override
   final int bookmarkCount;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, FeedsEnrichedCollectionResponse> collections;
 
   @override
   final int commentCount;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedsV3CommentResponse> comments;
 
   @override
@@ -91,6 +94,7 @@ class FeedsV3ActivityResponse with _$FeedsV3ActivityResponse {
   final FeedsFeedResponse? currentFeed;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
@@ -106,9 +110,11 @@ class FeedsV3ActivityResponse with _$FeedsV3ActivityResponse {
   final DateTime? expiresAt;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> feeds;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> filterTags;
 
   @override
@@ -124,6 +130,7 @@ class FeedsV3ActivityResponse with _$FeedsV3ActivityResponse {
   final String id;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> interestTags;
 
   @override
@@ -136,12 +143,14 @@ class FeedsV3ActivityResponse with _$FeedsV3ActivityResponse {
   final bool? isWatched;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedsReactionResponse> latestReactions;
 
   @override
   final FeedsActivityLocation? location;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<UserResponse> mentionedUsers;
 
   @override
@@ -157,9 +166,11 @@ class FeedsV3ActivityResponse with _$FeedsV3ActivityResponse {
   final FeedsNotificationContext? notificationContext;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedsBookmarkResponse> ownBookmarks;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedsReactionResponse> ownReactions;
 
   @override
@@ -178,6 +189,7 @@ class FeedsV3ActivityResponse with _$FeedsV3ActivityResponse {
   final int reactionCount;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, FeedsReactionGroupResponse> reactionGroups;
 
   @override
@@ -190,6 +202,7 @@ class FeedsV3ActivityResponse with _$FeedsV3ActivityResponse {
   final Map<String, Object?>? scoreVars;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> searchData;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feeds_v3_activity_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feeds_v3_activity_response.g.dart
index 4777510b..bcc0cce8 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feeds_v3_activity_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feeds_v3_activity_response.g.dart
@@ -9,64 +9,76 @@ part of 'feeds_v3_activity_response.dart';
 FeedsV3ActivityResponse _$FeedsV3ActivityResponseFromJson(
   Map<String, dynamic> json,
 ) => FeedsV3ActivityResponse(
-  attachments: (json['attachments'] as List<dynamic>)
-      .map((e) => Attachment.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  attachments:
+      (json['attachments'] as List<dynamic>?)?.map((e) => Attachment.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   bookmarkCount: (json['bookmark_count'] as num).toInt(),
-  collections: (json['collections'] as Map<String, dynamic>).map(
-    (k, e) => MapEntry(
-      k,
-      FeedsEnrichedCollectionResponse.fromJson(e as Map<String, dynamic>),
-    ),
-  ),
+  collections:
+      (json['collections'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          k,
+          FeedsEnrichedCollectionResponse.fromJson(e as Map<String, dynamic>),
+        ),
+      ) ??
+      {},
   commentCount: (json['comment_count'] as num).toInt(),
-  comments: (json['comments'] as List<dynamic>)
-      .map((e) => FeedsV3CommentResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  comments:
+      (json['comments'] as List<dynamic>?)
+          ?.map(
+            (e) => FeedsV3CommentResponse.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   currentFeed: json['current_feed'] == null
       ? null
       : FeedsFeedResponse.fromJson(
           json['current_feed'] as Map<String, dynamic>,
         ),
-  custom: json['custom'] as Map<String, dynamic>,
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  editedAt: _$JsonConverterFromJson<int, DateTime>(
+  editedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['edited_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  expiresAt: _$JsonConverterFromJson<int, DateTime>(
+  expiresAt: _$JsonConverterFromJson<Object, DateTime>(
     json['expires_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  feeds: (json['feeds'] as List<dynamic>).map((e) => e as String).toList(),
-  filterTags: (json['filter_tags'] as List<dynamic>).map((e) => e as String).toList(),
+  feeds: (json['feeds'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
+  filterTags: (json['filter_tags'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   friendReactionCount: (json['friend_reaction_count'] as num?)?.toInt(),
   friendReactions: (json['friend_reactions'] as List<dynamic>?)
       ?.map((e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>))
       .toList(),
   hidden: json['hidden'] as bool,
   id: json['id'] as String,
-  interestTags: (json['interest_tags'] as List<dynamic>).map((e) => e as String).toList(),
+  interestTags: (json['interest_tags'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   isRead: json['is_read'] as bool?,
   isSeen: json['is_seen'] as bool?,
   isWatched: json['is_watched'] as bool?,
-  latestReactions: (json['latest_reactions'] as List<dynamic>)
-      .map((e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  latestReactions:
+      (json['latest_reactions'] as List<dynamic>?)
+          ?.map(
+            (e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
   location: json['location'] == null
       ? null
       : FeedsActivityLocation.fromJson(
           json['location'] as Map<String, dynamic>,
         ),
-  mentionedUsers: (json['mentioned_users'] as List<dynamic>)
-      .map((e) => UserResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  mentionedUsers:
+      (json['mentioned_users'] as List<dynamic>?)
+          ?.map((e) => UserResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   metrics: (json['metrics'] as Map<String, dynamic>?)?.map(
     (k, e) => MapEntry(k, (e as num).toInt()),
   ),
@@ -81,12 +93,20 @@ FeedsV3ActivityResponse _$FeedsV3ActivityResponseFromJson(
       : FeedsNotificationContext.fromJson(
           json['notification_context'] as Map<String, dynamic>,
         ),
-  ownBookmarks: (json['own_bookmarks'] as List<dynamic>)
-      .map((e) => FeedsBookmarkResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
-  ownReactions: (json['own_reactions'] as List<dynamic>)
-      .map((e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  ownBookmarks:
+      (json['own_bookmarks'] as List<dynamic>?)
+          ?.map(
+            (e) => FeedsBookmarkResponse.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
+  ownReactions:
+      (json['own_reactions'] as List<dynamic>?)
+          ?.map(
+            (e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
   parent: json['parent'] == null
       ? null
       : FeedsV3ActivityResponse.fromJson(
@@ -96,22 +116,24 @@ FeedsV3ActivityResponse _$FeedsV3ActivityResponseFromJson(
   popularity: (json['popularity'] as num).toInt(),
   preview: json['preview'] as bool,
   reactionCount: (json['reaction_count'] as num).toInt(),
-  reactionGroups: (json['reaction_groups'] as Map<String, dynamic>).map(
-    (k, e) => MapEntry(
-      k,
-      FeedsReactionGroupResponse.fromJson(e as Map<String, dynamic>),
-    ),
-  ),
+  reactionGroups:
+      (json['reaction_groups'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          k,
+          FeedsReactionGroupResponse.fromJson(e as Map<String, dynamic>),
+        ),
+      ) ??
+      {},
   restrictReplies: json['restrict_replies'] as String,
   score: (json['score'] as num).toDouble(),
   scoreVars: json['score_vars'] as Map<String, dynamic>?,
-  searchData: json['search_data'] as Map<String, dynamic>,
+  searchData: json['search_data'] as Map<String, dynamic>? ?? {},
   selectorSource: json['selector_source'] as String?,
   shareCount: (json['share_count'] as num).toInt(),
   text: json['text'] as String?,
   type: json['type'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: UserResponse.fromJson(json['user'] as Map<String, dynamic>),
   visibility: json['visibility'] as String,
@@ -129,15 +151,15 @@ Map<String, dynamic> _$FeedsV3ActivityResponseToJson(
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'current_feed': instance.currentFeed?.toJson(),
   'custom': instance.custom,
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
-  'edited_at': _$JsonConverterToJson<int, DateTime>(
+  'edited_at': _$JsonConverterToJson<Object, DateTime>(
     instance.editedAt,
     const EpochDateTimeConverter().toJson,
   ),
-  'expires_at': _$JsonConverterToJson<int, DateTime>(
+  'expires_at': _$JsonConverterToJson<Object, DateTime>(
     instance.expiresAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feeds_v3_comment_response.dart b/packages/stream_feeds/lib/src/generated/api/model/feeds_v3_comment_response.dart
index a5da8975..cfd770b4 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feeds_v3_comment_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feeds_v3_comment_response.dart
@@ -83,6 +83,7 @@ class FeedsV3CommentResponse with _$FeedsV3CommentResponse {
   final List<FeedsReactionResponse>? latestReactions;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<UserResponse> mentionedUsers;
 
   @override
@@ -95,6 +96,7 @@ class FeedsV3CommentResponse with _$FeedsV3CommentResponse {
   final String objectType;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedsReactionResponse> ownReactions;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/feeds_v3_comment_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/feeds_v3_comment_response.g.dart
index 21bbb52e..786f7ed7 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/feeds_v3_comment_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/feeds_v3_comment_response.g.dart
@@ -16,15 +16,15 @@ FeedsV3CommentResponse _$FeedsV3CommentResponseFromJson(
   confidenceScore: (json['confidence_score'] as num).toDouble(),
   controversyScore: (json['controversy_score'] as num?)?.toDouble(),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   custom: json['custom'] as Map<String, dynamic>?,
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
   downvoteCount: (json['downvote_count'] as num).toInt(),
-  editedAt: _$JsonConverterFromJson<int, DateTime>(
+  editedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['edited_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -32,9 +32,11 @@ FeedsV3CommentResponse _$FeedsV3CommentResponseFromJson(
   latestReactions: (json['latest_reactions'] as List<dynamic>?)
       ?.map((e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>))
       .toList(),
-  mentionedUsers: (json['mentioned_users'] as List<dynamic>)
-      .map((e) => UserResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  mentionedUsers:
+      (json['mentioned_users'] as List<dynamic>?)
+          ?.map((e) => UserResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   moderation: json['moderation'] == null
       ? null
       : ModerationV2Response.fromJson(
@@ -42,9 +44,13 @@ FeedsV3CommentResponse _$FeedsV3CommentResponseFromJson(
         ),
   objectId: json['object_id'] as String,
   objectType: json['object_type'] as String,
-  ownReactions: (json['own_reactions'] as List<dynamic>)
-      .map((e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  ownReactions:
+      (json['own_reactions'] as List<dynamic>?)
+          ?.map(
+            (e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
   parentId: json['parent_id'] as String?,
   reactionCount: (json['reaction_count'] as num).toInt(),
   reactionGroups: (json['reaction_groups'] as Map<String, dynamic>?)?.map(
@@ -58,7 +64,7 @@ FeedsV3CommentResponse _$FeedsV3CommentResponseFromJson(
   status: json['status'] as String,
   text: json['text'] as String?,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   upvoteCount: (json['upvote_count'] as num).toInt(),
   user: UserResponse.fromJson(json['user'] as Map<String, dynamic>),
@@ -73,12 +79,12 @@ Map<String, dynamic> _$FeedsV3CommentResponseToJson(
   'controversy_score': instance.controversyScore,
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
   'downvote_count': instance.downvoteCount,
-  'edited_at': _$JsonConverterToJson<int, DateTime>(
+  'edited_at': _$JsonConverterToJson<Object, DateTime>(
     instance.editedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/file_upload_config.dart b/packages/stream_feeds/lib/src/generated/api/model/file_upload_config.dart
index d7c7a91c..a68bfd5d 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/file_upload_config.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/file_upload_config.dart
@@ -26,15 +26,19 @@ class FileUploadConfig with _$FileUploadConfig {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> allowedFileExtensions;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> allowedMimeTypes;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> blockedFileExtensions;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> blockedMimeTypes;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/file_upload_config.g.dart b/packages/stream_feeds/lib/src/generated/api/model/file_upload_config.g.dart
index 18c46240..0b9ccacc 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/file_upload_config.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/file_upload_config.g.dart
@@ -7,10 +7,10 @@ part of 'file_upload_config.dart';
 // **************************************************************************
 
 FileUploadConfig _$FileUploadConfigFromJson(Map<String, dynamic> json) => FileUploadConfig(
-  allowedFileExtensions: (json['allowed_file_extensions'] as List<dynamic>).map((e) => e as String).toList(),
-  allowedMimeTypes: (json['allowed_mime_types'] as List<dynamic>).map((e) => e as String).toList(),
-  blockedFileExtensions: (json['blocked_file_extensions'] as List<dynamic>).map((e) => e as String).toList(),
-  blockedMimeTypes: (json['blocked_mime_types'] as List<dynamic>).map((e) => e as String).toList(),
+  allowedFileExtensions: (json['allowed_file_extensions'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
+  allowedMimeTypes: (json['allowed_mime_types'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
+  blockedFileExtensions: (json['blocked_file_extensions'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
+  blockedMimeTypes: (json['blocked_mime_types'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   sizeLimit: (json['size_limit'] as num).toInt(),
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/filter_config_response.dart b/packages/stream_feeds/lib/src/generated/api/model/filter_config_response.dart
index 1590c75f..d81c45f4 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/filter_config_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/filter_config_response.dart
@@ -34,6 +34,7 @@ class FilterConfigResponse with _$FilterConfigResponse {
   final List<String>? filterableCustomKeys;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> llmLabels;
 
   Map<String, dynamic> toJson() => _$FilterConfigResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/filter_config_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/filter_config_response.g.dart
index 77d20309..7a95b103 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/filter_config_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/filter_config_response.g.dart
@@ -12,7 +12,7 @@ FilterConfigResponse _$FilterConfigResponseFromJson(
   aiTextLabels: (json['ai_text_labels'] as List<dynamic>?)?.map((e) => e as String).toList(),
   configKeys: (json['config_keys'] as List<dynamic>?)?.map((e) => e as String).toList(),
   filterableCustomKeys: (json['filterable_custom_keys'] as List<dynamic>?)?.map((e) => e as String).toList(),
-  llmLabels: (json['llm_labels'] as List<dynamic>).map((e) => e as String).toList(),
+  llmLabels: (json['llm_labels'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
 );
 
 Map<String, dynamic> _$FilterConfigResponseToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/follow_batch_request.dart b/packages/stream_feeds/lib/src/generated/api/model/follow_batch_request.dart
index 5b6cc7db..77dd0ec8 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/follow_batch_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/follow_batch_request.dart
@@ -26,6 +26,7 @@ class FollowBatchRequest with _$FollowBatchRequest {
   final bool? enrichOwnFields;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FollowRequest> follows;
 
   Map<String, dynamic> toJson() => _$FollowBatchRequestToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/follow_batch_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/follow_batch_request.g.dart
index aa29643e..98bf0104 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/follow_batch_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/follow_batch_request.g.dart
@@ -8,7 +8,8 @@ part of 'follow_batch_request.dart';
 
 FollowBatchRequest _$FollowBatchRequestFromJson(Map<String, dynamic> json) => FollowBatchRequest(
   enrichOwnFields: json['enrich_own_fields'] as bool?,
-  follows: (json['follows'] as List<dynamic>).map((e) => FollowRequest.fromJson(e as Map<String, dynamic>)).toList(),
+  follows:
+      (json['follows'] as List<dynamic>?)?.map((e) => FollowRequest.fromJson(e as Map<String, dynamic>)).toList() ?? [],
 );
 
 Map<String, dynamic> _$FollowBatchRequestToJson(FollowBatchRequest instance) => <String, dynamic>{
diff --git a/packages/stream_feeds/lib/src/generated/api/model/follow_batch_response.dart b/packages/stream_feeds/lib/src/generated/api/model/follow_batch_response.dart
index 95c6c7d8..0f1a1bd0 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/follow_batch_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/follow_batch_response.dart
@@ -24,12 +24,14 @@ class FollowBatchResponse with _$FollowBatchResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FollowResponse> created;
 
   @override
   final String duration;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FollowResponse> follows;
 
   Map<String, dynamic> toJson() => _$FollowBatchResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/follow_batch_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/follow_batch_response.g.dart
index e3322faa..2e038c4c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/follow_batch_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/follow_batch_response.g.dart
@@ -7,9 +7,13 @@ part of 'follow_batch_response.dart';
 // **************************************************************************
 
 FollowBatchResponse _$FollowBatchResponseFromJson(Map<String, dynamic> json) => FollowBatchResponse(
-  created: (json['created'] as List<dynamic>).map((e) => FollowResponse.fromJson(e as Map<String, dynamic>)).toList(),
+  created:
+      (json['created'] as List<dynamic>?)?.map((e) => FollowResponse.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   duration: json['duration'] as String,
-  follows: (json['follows'] as List<dynamic>).map((e) => FollowResponse.fromJson(e as Map<String, dynamic>)).toList(),
+  follows:
+      (json['follows'] as List<dynamic>?)?.map((e) => FollowResponse.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
 );
 
 Map<String, dynamic> _$FollowBatchResponseToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/follow_created_event.dart b/packages/stream_feeds/lib/src/generated/api/model/follow_created_event.dart
index 0ab3bcb6..8b64bf6f 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/follow_created_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/follow_created_event.dart
@@ -32,6 +32,7 @@ class FollowCreatedEvent extends core.WsEvent with _$FollowCreatedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/follow_created_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/follow_created_event.g.dart
index 3f8ca3c2..b5b46f1e 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/follow_created_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/follow_created_event.g.dart
@@ -8,13 +8,13 @@ part of 'follow_created_event.dart';
 
 FollowCreatedEvent _$FollowCreatedEventFromJson(Map<String, dynamic> json) => FollowCreatedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   follow: FollowResponse.fromJson(json['follow'] as Map<String, dynamic>),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -27,7 +27,7 @@ Map<String, dynamic> _$FollowCreatedEventToJson(FollowCreatedEvent instance) =>
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'follow': instance.follow.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/follow_deleted_event.dart b/packages/stream_feeds/lib/src/generated/api/model/follow_deleted_event.dart
index 664caffe..75d63686 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/follow_deleted_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/follow_deleted_event.dart
@@ -32,6 +32,7 @@ class FollowDeletedEvent extends core.WsEvent with _$FollowDeletedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/follow_deleted_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/follow_deleted_event.g.dart
index 9added50..a69b8c38 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/follow_deleted_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/follow_deleted_event.g.dart
@@ -8,13 +8,13 @@ part of 'follow_deleted_event.dart';
 
 FollowDeletedEvent _$FollowDeletedEventFromJson(Map<String, dynamic> json) => FollowDeletedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   follow: FollowResponse.fromJson(json['follow'] as Map<String, dynamic>),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -27,7 +27,7 @@ Map<String, dynamic> _$FollowDeletedEventToJson(FollowDeletedEvent instance) =>
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'follow': instance.follow.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/follow_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/follow_response.g.dart
index 072859ca..271a694c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/follow_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/follow_response.g.dart
@@ -8,7 +8,7 @@ part of 'follow_response.dart';
 
 FollowResponse _$FollowResponseFromJson(Map<String, dynamic> json) => FollowResponse(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   custom: json['custom'] as Map<String, dynamic>?,
   followerRole: json['follower_role'] as String,
@@ -17,11 +17,11 @@ FollowResponse _$FollowResponseFromJson(Map<String, dynamic> json) => FollowResp
     json['push_preference'],
     unknownValue: FollowResponsePushPreference.unknown,
   ),
-  requestAcceptedAt: _$JsonConverterFromJson<int, DateTime>(
+  requestAcceptedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['request_accepted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  requestRejectedAt: _$JsonConverterFromJson<int, DateTime>(
+  requestRejectedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['request_rejected_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -37,7 +37,7 @@ FollowResponse _$FollowResponseFromJson(Map<String, dynamic> json) => FollowResp
     json['target_feed'] as Map<String, dynamic>,
   ),
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
 );
 
@@ -46,11 +46,11 @@ Map<String, dynamic> _$FollowResponseToJson(FollowResponse instance) => <String,
   'custom': instance.custom,
   'follower_role': instance.followerRole,
   'push_preference': _$FollowResponsePushPreferenceEnumMap[instance.pushPreference]!,
-  'request_accepted_at': _$JsonConverterToJson<int, DateTime>(
+  'request_accepted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.requestAcceptedAt,
     const EpochDateTimeConverter().toJson,
   ),
-  'request_rejected_at': _$JsonConverterToJson<int, DateTime>(
+  'request_rejected_at': _$JsonConverterToJson<Object, DateTime>(
     instance.requestRejectedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/follow_updated_event.dart b/packages/stream_feeds/lib/src/generated/api/model/follow_updated_event.dart
index ba8ad80a..ba229b45 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/follow_updated_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/follow_updated_event.dart
@@ -32,6 +32,7 @@ class FollowUpdatedEvent extends core.WsEvent with _$FollowUpdatedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/follow_updated_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/follow_updated_event.g.dart
index 61ef0516..257e94cf 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/follow_updated_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/follow_updated_event.g.dart
@@ -8,13 +8,13 @@ part of 'follow_updated_event.dart';
 
 FollowUpdatedEvent _$FollowUpdatedEventFromJson(Map<String, dynamic> json) => FollowUpdatedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   follow: FollowResponse.fromJson(json['follow'] as Map<String, dynamic>),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -27,7 +27,7 @@ Map<String, dynamic> _$FollowUpdatedEventToJson(FollowUpdatedEvent instance) =>
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'follow': instance.follow.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/full_user_response.dart b/packages/stream_feeds/lib/src/generated/api/model/full_user_response.dart
index 0507700c..6da481b4 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/full_user_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/full_user_response.dart
@@ -61,9 +61,11 @@ class FullUserResponse with _$FullUserResponse {
   final bool banned;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> blockedUserIds;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ChannelMute> channelMutes;
 
   @override
@@ -71,6 +73,7 @@ class FullUserResponse with _$FullUserResponse {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
@@ -82,6 +85,7 @@ class FullUserResponse with _$FullUserResponse {
   final DateTime? deletedAt;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<DeviceResponse> devices;
 
   @override
@@ -104,6 +108,7 @@ class FullUserResponse with _$FullUserResponse {
   final List<String>? latestHiddenChannels;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<UserMuteResponse> mutes;
 
   @override
@@ -126,6 +131,7 @@ class FullUserResponse with _$FullUserResponse {
   final bool shadowBanned;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> teams;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/full_user_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/full_user_response.g.dart
index 2c7130b8..e9d9cd21 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/full_user_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/full_user_response.g.dart
@@ -8,38 +8,42 @@ part of 'full_user_response.dart';
 
 FullUserResponse _$FullUserResponseFromJson(Map<String, dynamic> json) => FullUserResponse(
   avgResponseTime: (json['avg_response_time'] as num?)?.toInt(),
-  banExpires: _$JsonConverterFromJson<int, DateTime>(
+  banExpires: _$JsonConverterFromJson<Object, DateTime>(
     json['ban_expires'],
     const EpochDateTimeConverter().fromJson,
   ),
   banned: json['banned'] as bool,
-  blockedUserIds: (json['blocked_user_ids'] as List<dynamic>).map((e) => e as String).toList(),
-  channelMutes: (json['channel_mutes'] as List<dynamic>)
-      .map((e) => ChannelMute.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  blockedUserIds: (json['blocked_user_ids'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
+  channelMutes:
+      (json['channel_mutes'] as List<dynamic>?)?.map((e) => ChannelMute.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
-  deactivatedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  deactivatedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deactivated_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  devices: (json['devices'] as List<dynamic>).map((e) => DeviceResponse.fromJson(e as Map<String, dynamic>)).toList(),
+  devices:
+      (json['devices'] as List<dynamic>?)?.map((e) => DeviceResponse.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   id: json['id'] as String,
   image: json['image'] as String?,
   invisible: json['invisible'] as bool,
   language: json['language'] as String,
-  lastActive: _$JsonConverterFromJson<int, DateTime>(
+  lastActive: _$JsonConverterFromJson<Object, DateTime>(
     json['last_active'],
     const EpochDateTimeConverter().fromJson,
   ),
   latestHiddenChannels: (json['latest_hidden_channels'] as List<dynamic>?)?.map((e) => e as String).toList(),
-  mutes: (json['mutes'] as List<dynamic>).map((e) => UserMuteResponse.fromJson(e as Map<String, dynamic>)).toList(),
+  mutes:
+      (json['mutes'] as List<dynamic>?)?.map((e) => UserMuteResponse.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   name: json['name'] as String?,
   online: json['online'] as bool,
   privacySettings: json['privacy_settings'] == null
@@ -47,13 +51,13 @@ FullUserResponse _$FullUserResponseFromJson(Map<String, dynamic> json) => FullUs
       : PrivacySettingsResponse.fromJson(
           json['privacy_settings'] as Map<String, dynamic>,
         ),
-  revokeTokensIssuedBefore: _$JsonConverterFromJson<int, DateTime>(
+  revokeTokensIssuedBefore: _$JsonConverterFromJson<Object, DateTime>(
     json['revoke_tokens_issued_before'],
     const EpochDateTimeConverter().fromJson,
   ),
   role: json['role'] as String,
   shadowBanned: json['shadow_banned'] as bool,
-  teams: (json['teams'] as List<dynamic>).map((e) => e as String).toList(),
+  teams: (json['teams'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   teamsRole: (json['teams_role'] as Map<String, dynamic>?)?.map(
     (k, e) => MapEntry(k, e as String),
   ),
@@ -62,13 +66,13 @@ FullUserResponse _$FullUserResponseFromJson(Map<String, dynamic> json) => FullUs
   unreadCount: (json['unread_count'] as num).toInt(),
   unreadThreads: (json['unread_threads'] as num).toInt(),
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
 );
 
 Map<String, dynamic> _$FullUserResponseToJson(FullUserResponse instance) => <String, dynamic>{
   'avg_response_time': instance.avgResponseTime,
-  'ban_expires': _$JsonConverterToJson<int, DateTime>(
+  'ban_expires': _$JsonConverterToJson<Object, DateTime>(
     instance.banExpires,
     const EpochDateTimeConverter().toJson,
   ),
@@ -77,11 +81,11 @@ Map<String, dynamic> _$FullUserResponseToJson(FullUserResponse instance) => <Str
   'channel_mutes': instance.channelMutes.map((e) => e.toJson()).toList(),
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'deactivated_at': _$JsonConverterToJson<int, DateTime>(
+  'deactivated_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deactivatedAt,
     const EpochDateTimeConverter().toJson,
   ),
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
@@ -90,7 +94,7 @@ Map<String, dynamic> _$FullUserResponseToJson(FullUserResponse instance) => <Str
   'image': instance.image,
   'invisible': instance.invisible,
   'language': instance.language,
-  'last_active': _$JsonConverterToJson<int, DateTime>(
+  'last_active': _$JsonConverterToJson<Object, DateTime>(
     instance.lastActive,
     const EpochDateTimeConverter().toJson,
   ),
@@ -99,7 +103,7 @@ Map<String, dynamic> _$FullUserResponseToJson(FullUserResponse instance) => <Str
   'name': instance.name,
   'online': instance.online,
   'privacy_settings': instance.privacySettings?.toJson(),
-  'revoke_tokens_issued_before': _$JsonConverterToJson<int, DateTime>(
+  'revoke_tokens_issued_before': _$JsonConverterToJson<Object, DateTime>(
     instance.revokeTokensIssuedBefore,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/get_action_config_response.dart b/packages/stream_feeds/lib/src/generated/api/model/get_action_config_response.dart
index e97802d4..a2ea0a55 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/get_action_config_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/get_action_config_response.dart
@@ -23,6 +23,7 @@ class GetActionConfigResponse with _$GetActionConfigResponse {
   });
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, List<ModerationActionConfigResponse>> actionConfig;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/get_action_config_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/get_action_config_response.g.dart
index 7b40f7d9..55be2f13 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/get_action_config_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/get_action_config_response.g.dart
@@ -9,18 +9,20 @@ part of 'get_action_config_response.dart';
 GetActionConfigResponse _$GetActionConfigResponseFromJson(
   Map<String, dynamic> json,
 ) => GetActionConfigResponse(
-  actionConfig: (json['action_config'] as Map<String, dynamic>).map(
-    (k, e) => MapEntry(
-      k,
-      (e as List<dynamic>)
-          .map(
-            (e) => ModerationActionConfigResponse.fromJson(
-              e as Map<String, dynamic>,
-            ),
-          )
-          .toList(),
-    ),
-  ),
+  actionConfig:
+      (json['action_config'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          k,
+          (e as List<dynamic>)
+              .map(
+                (e) => ModerationActionConfigResponse.fromJson(
+                  e as Map<String, dynamic>,
+                ),
+              )
+              .toList(),
+        ),
+      ) ??
+      {},
   duration: json['duration'] as String,
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/get_blocked_users_response.dart b/packages/stream_feeds/lib/src/generated/api/model/get_blocked_users_response.dart
index 9fce1aff..fdfaaccf 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/get_blocked_users_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/get_blocked_users_response.dart
@@ -23,6 +23,7 @@ class GetBlockedUsersResponse with _$GetBlockedUsersResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<BlockedUserResponse> blocks;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/get_blocked_users_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/get_blocked_users_response.g.dart
index 2c69868f..cee2876c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/get_blocked_users_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/get_blocked_users_response.g.dart
@@ -9,9 +9,11 @@ part of 'get_blocked_users_response.dart';
 GetBlockedUsersResponse _$GetBlockedUsersResponseFromJson(
   Map<String, dynamic> json,
 ) => GetBlockedUsersResponse(
-  blocks: (json['blocks'] as List<dynamic>)
-      .map((e) => BlockedUserResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  blocks:
+      (json['blocks'] as List<dynamic>?)
+          ?.map((e) => BlockedUserResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   duration: json['duration'] as String,
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/get_comment_replies_response.dart b/packages/stream_feeds/lib/src/generated/api/model/get_comment_replies_response.dart
index eba37301..14e837b5 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/get_comment_replies_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/get_comment_replies_response.dart
@@ -26,6 +26,7 @@ class GetCommentRepliesResponse with _$GetCommentRepliesResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ThreadedCommentResponse> comments;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/get_comment_replies_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/get_comment_replies_response.g.dart
index 4c49442d..321b1593 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/get_comment_replies_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/get_comment_replies_response.g.dart
@@ -9,9 +9,13 @@ part of 'get_comment_replies_response.dart';
 GetCommentRepliesResponse _$GetCommentRepliesResponseFromJson(
   Map<String, dynamic> json,
 ) => GetCommentRepliesResponse(
-  comments: (json['comments'] as List<dynamic>)
-      .map((e) => ThreadedCommentResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  comments:
+      (json['comments'] as List<dynamic>?)
+          ?.map(
+            (e) => ThreadedCommentResponse.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
   duration: json['duration'] as String,
   next: json['next'] as String?,
   prev: json['prev'] as String?,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/get_comments_response.dart b/packages/stream_feeds/lib/src/generated/api/model/get_comments_response.dart
index baade179..3c06cbcf 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/get_comments_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/get_comments_response.dart
@@ -26,6 +26,7 @@ class GetCommentsResponse with _$GetCommentsResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ThreadedCommentResponse> comments;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/get_comments_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/get_comments_response.g.dart
index 31522736..adee815a 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/get_comments_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/get_comments_response.g.dart
@@ -7,11 +7,13 @@ part of 'get_comments_response.dart';
 // **************************************************************************
 
 GetCommentsResponse _$GetCommentsResponseFromJson(Map<String, dynamic> json) => GetCommentsResponse(
-  comments: (json['comments'] as List<dynamic>)
-      .map(
-        (e) => ThreadedCommentResponse.fromJson(e as Map<String, dynamic>),
-      )
-      .toList(),
+  comments:
+      (json['comments'] as List<dynamic>?)
+          ?.map(
+            (e) => ThreadedCommentResponse.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
   duration: json['duration'] as String,
   next: json['next'] as String?,
   prev: json['prev'] as String?,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/get_follow_suggestions_response.dart b/packages/stream_feeds/lib/src/generated/api/model/get_follow_suggestions_response.dart
index 57334992..7b816c22 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/get_follow_suggestions_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/get_follow_suggestions_response.dart
@@ -30,6 +30,7 @@ class GetFollowSuggestionsResponse with _$GetFollowSuggestionsResponse {
   final String duration;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedSuggestionResponse> suggestions;
 
   Map<String, dynamic> toJson() => _$GetFollowSuggestionsResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/get_follow_suggestions_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/get_follow_suggestions_response.g.dart
index 8e393d46..2a86a38a 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/get_follow_suggestions_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/get_follow_suggestions_response.g.dart
@@ -11,9 +11,13 @@ GetFollowSuggestionsResponse _$GetFollowSuggestionsResponseFromJson(
 ) => GetFollowSuggestionsResponse(
   algorithmUsed: json['algorithm_used'] as String?,
   duration: json['duration'] as String,
-  suggestions: (json['suggestions'] as List<dynamic>)
-      .map((e) => FeedSuggestionResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  suggestions:
+      (json['suggestions'] as List<dynamic>?)
+          ?.map(
+            (e) => FeedSuggestionResponse.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$GetFollowSuggestionsResponseToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/get_og_response.dart b/packages/stream_feeds/lib/src/generated/api/model/get_og_response.dart
index 395015cd..aeb7c89e 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/get_og_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/get_og_response.dart
@@ -62,6 +62,7 @@ class GetOGResponse with _$GetOGResponse {
   final String? color;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/get_og_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/get_og_response.g.dart
index 7f8dc243..a1adf594 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/get_og_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/get_og_response.g.dart
@@ -13,7 +13,7 @@ GetOGResponse _$GetOGResponseFromJson(Map<String, dynamic> json) => GetOGRespons
   authorLink: json['author_link'] as String?,
   authorName: json['author_name'] as String?,
   color: json['color'] as String?,
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   duration: json['duration'] as String,
   fallback: json['fallback'] as String?,
   fields: (json['fields'] as List<dynamic>?)?.map((e) => Field.fromJson(e as Map<String, dynamic>)).toList(),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/get_or_create_feed_response.dart b/packages/stream_feeds/lib/src/generated/api/model/get_or_create_feed_response.dart
index f4955b90..b526d708 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/get_or_create_feed_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/get_or_create_feed_response.dart
@@ -36,9 +36,11 @@ class GetOrCreateFeedResponse with _$GetOrCreateFeedResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ActivityResponse> activities;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<AggregatedActivityResponse> aggregatedActivities;
 
   @override
@@ -51,12 +53,14 @@ class GetOrCreateFeedResponse with _$GetOrCreateFeedResponse {
   final FeedResponse feed;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FollowResponse> followers;
 
   @override
   final PagerResponse? followersPagination;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FollowResponse> following;
 
   @override
@@ -66,6 +70,7 @@ class GetOrCreateFeedResponse with _$GetOrCreateFeedResponse {
   final PagerResponse? memberPagination;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedMemberResponse> members;
 
   @override
@@ -75,6 +80,7 @@ class GetOrCreateFeedResponse with _$GetOrCreateFeedResponse {
   final NotificationStatusResponse? notificationStatus;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ActivityPinResponse> pinnedActivities;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/get_or_create_feed_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/get_or_create_feed_response.g.dart
index a7819d91..3be45e64 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/get_or_create_feed_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/get_or_create_feed_response.g.dart
@@ -9,28 +9,32 @@ part of 'get_or_create_feed_response.dart';
 GetOrCreateFeedResponse _$GetOrCreateFeedResponseFromJson(
   Map<String, dynamic> json,
 ) => GetOrCreateFeedResponse(
-  activities: (json['activities'] as List<dynamic>)
-      .map((e) => ActivityResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
-  aggregatedActivities: (json['aggregated_activities'] as List<dynamic>)
-      .map(
-        (e) => AggregatedActivityResponse.fromJson(e as Map<String, dynamic>),
-      )
-      .toList(),
+  activities:
+      (json['activities'] as List<dynamic>?)
+          ?.map((e) => ActivityResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
+  aggregatedActivities:
+      (json['aggregated_activities'] as List<dynamic>?)
+          ?.map(
+            (e) => AggregatedActivityResponse.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
   created: json['created'] as bool,
   duration: json['duration'] as String,
   feed: FeedResponse.fromJson(json['feed'] as Map<String, dynamic>),
-  followers: (json['followers'] as List<dynamic>)
-      .map((e) => FollowResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  followers:
+      (json['followers'] as List<dynamic>?)?.map((e) => FollowResponse.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   followersPagination: json['followers_pagination'] == null
       ? null
       : PagerResponse.fromJson(
           json['followers_pagination'] as Map<String, dynamic>,
         ),
-  following: (json['following'] as List<dynamic>)
-      .map((e) => FollowResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  following:
+      (json['following'] as List<dynamic>?)?.map((e) => FollowResponse.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   followingPagination: json['following_pagination'] == null
       ? null
       : PagerResponse.fromJson(
@@ -41,18 +45,22 @@ GetOrCreateFeedResponse _$GetOrCreateFeedResponseFromJson(
       : PagerResponse.fromJson(
           json['member_pagination'] as Map<String, dynamic>,
         ),
-  members: (json['members'] as List<dynamic>)
-      .map((e) => FeedMemberResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  members:
+      (json['members'] as List<dynamic>?)
+          ?.map((e) => FeedMemberResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   next: json['next'] as String?,
   notificationStatus: json['notification_status'] == null
       ? null
       : NotificationStatusResponse.fromJson(
           json['notification_status'] as Map<String, dynamic>,
         ),
-  pinnedActivities: (json['pinned_activities'] as List<dynamic>)
-      .map((e) => ActivityPinResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  pinnedActivities:
+      (json['pinned_activities'] as List<dynamic>?)
+          ?.map((e) => ActivityPinResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   prev: json['prev'] as String?,
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/get_user_interests_response.dart b/packages/stream_feeds/lib/src/generated/api/model/get_user_interests_response.dart
index ddb268f1..920d1950 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/get_user_interests_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/get_user_interests_response.dart
@@ -26,6 +26,7 @@ class GetUserInterestsResponse with _$GetUserInterestsResponse {
   final String duration;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<InterestTagResponse> interests;
 
   Map<String, dynamic> toJson() => _$GetUserInterestsResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/get_user_interests_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/get_user_interests_response.g.dart
index fb6ebb0d..790017e4 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/get_user_interests_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/get_user_interests_response.g.dart
@@ -10,9 +10,11 @@ GetUserInterestsResponse _$GetUserInterestsResponseFromJson(
   Map<String, dynamic> json,
 ) => GetUserInterestsResponse(
   duration: json['duration'] as String,
-  interests: (json['interests'] as List<dynamic>)
-      .map((e) => InterestTagResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  interests:
+      (json['interests'] as List<dynamic>?)
+          ?.map((e) => InterestTagResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$GetUserInterestsResponseToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/harm_config.dart b/packages/stream_feeds/lib/src/generated/api/model/harm_config.dart
index de503ebd..ceee5b6c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/harm_config.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/harm_config.dart
@@ -26,12 +26,14 @@ class HarmConfig with _$HarmConfig {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ActionSequence> actionSequences;
 
   @override
   final int cooldownPeriod;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> harmTypes;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/harm_config.g.dart b/packages/stream_feeds/lib/src/generated/api/model/harm_config.g.dart
index 1f1f4a69..faa6a939 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/harm_config.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/harm_config.g.dart
@@ -7,11 +7,13 @@ part of 'harm_config.dart';
 // **************************************************************************
 
 HarmConfig _$HarmConfigFromJson(Map<String, dynamic> json) => HarmConfig(
-  actionSequences: (json['action_sequences'] as List<dynamic>)
-      .map((e) => ActionSequence.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  actionSequences:
+      (json['action_sequences'] as List<dynamic>?)
+          ?.map((e) => ActionSequence.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   cooldownPeriod: (json['cooldown_period'] as num).toInt(),
-  harmTypes: (json['harm_types'] as List<dynamic>).map((e) => e as String).toList(),
+  harmTypes: (json['harm_types'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   severity: (json['severity'] as num).toInt(),
   threshold: (json['threshold'] as num).toInt(),
 );
diff --git a/packages/stream_feeds/lib/src/generated/api/model/list_block_list_response.dart b/packages/stream_feeds/lib/src/generated/api/model/list_block_list_response.dart
index 09172127..65a53b94 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/list_block_list_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/list_block_list_response.dart
@@ -23,6 +23,7 @@ class ListBlockListResponse with _$ListBlockListResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<BlockListResponse> blocklists;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/list_block_list_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/list_block_list_response.g.dart
index 80e6f3a8..cf3d082f 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/list_block_list_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/list_block_list_response.g.dart
@@ -9,9 +9,11 @@ part of 'list_block_list_response.dart';
 ListBlockListResponse _$ListBlockListResponseFromJson(
   Map<String, dynamic> json,
 ) => ListBlockListResponse(
-  blocklists: (json['blocklists'] as List<dynamic>)
-      .map((e) => BlockListResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  blocklists:
+      (json['blocklists'] as List<dynamic>?)
+          ?.map((e) => BlockListResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   duration: json['duration'] as String,
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/list_devices_response.dart b/packages/stream_feeds/lib/src/generated/api/model/list_devices_response.dart
index fa2341fb..79a33ab1 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/list_devices_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/list_devices_response.dart
@@ -23,6 +23,7 @@ class ListDevicesResponse with _$ListDevicesResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<DeviceResponse> devices;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/list_devices_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/list_devices_response.g.dart
index b1c328e7..7e4e0676 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/list_devices_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/list_devices_response.g.dart
@@ -7,7 +7,9 @@ part of 'list_devices_response.dart';
 // **************************************************************************
 
 ListDevicesResponse _$ListDevicesResponseFromJson(Map<String, dynamic> json) => ListDevicesResponse(
-  devices: (json['devices'] as List<dynamic>).map((e) => DeviceResponse.fromJson(e as Map<String, dynamic>)).toList(),
+  devices:
+      (json['devices'] as List<dynamic>?)?.map((e) => DeviceResponse.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   duration: json['duration'] as String,
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/list_user_groups_response.dart b/packages/stream_feeds/lib/src/generated/api/model/list_user_groups_response.dart
index 35141250..c50bf3d5 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/list_user_groups_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/list_user_groups_response.dart
@@ -26,6 +26,7 @@ class ListUserGroupsResponse with _$ListUserGroupsResponse {
   final String duration;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<UserGroupResponse> userGroups;
 
   Map<String, dynamic> toJson() => _$ListUserGroupsResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/list_user_groups_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/list_user_groups_response.g.dart
index 5c025d83..a88703d3 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/list_user_groups_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/list_user_groups_response.g.dart
@@ -10,9 +10,11 @@ ListUserGroupsResponse _$ListUserGroupsResponseFromJson(
   Map<String, dynamic> json,
 ) => ListUserGroupsResponse(
   duration: json['duration'] as String,
-  userGroups: (json['user_groups'] as List<dynamic>)
-      .map((e) => UserGroupResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  userGroups:
+      (json['user_groups'] as List<dynamic>?)
+          ?.map((e) => UserGroupResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$ListUserGroupsResponseToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/llm_config.dart b/packages/stream_feeds/lib/src/generated/api/model/llm_config.dart
index 9d09618a..63e36ee0 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/llm_config.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/llm_config.dart
@@ -35,6 +35,7 @@ class LLMConfig with _$LLMConfig {
   final bool enabled;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<LLMRule> rules;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/llm_config.g.dart b/packages/stream_feeds/lib/src/generated/api/model/llm_config.g.dart
index f91c8553..ddb72417 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/llm_config.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/llm_config.g.dart
@@ -10,7 +10,7 @@ LLMConfig _$LLMConfigFromJson(Map<String, dynamic> json) => LLMConfig(
   appContext: json['app_context'] as String?,
   async: json['async'] as bool?,
   enabled: json['enabled'] as bool,
-  rules: (json['rules'] as List<dynamic>).map((e) => LLMRule.fromJson(e as Map<String, dynamic>)).toList(),
+  rules: (json['rules'] as List<dynamic>?)?.map((e) => LLMRule.fromJson(e as Map<String, dynamic>)).toList() ?? [],
   severityDescriptions: (json['severity_descriptions'] as Map<String, dynamic>?)?.map(
     (k, e) => MapEntry(k, e as String),
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/llm_rule.dart b/packages/stream_feeds/lib/src/generated/api/model/llm_rule.dart
index 3870f45c..11ae2082 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/llm_rule.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/llm_rule.dart
@@ -55,6 +55,7 @@ class LLMRule with _$LLMRule {
   final String label;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<BodyguardSeverityRule> severityRules;
 
   Map<String, dynamic> toJson() => _$LLMRuleToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/llm_rule.g.dart b/packages/stream_feeds/lib/src/generated/api/model/llm_rule.g.dart
index e178057c..78297962 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/llm_rule.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/llm_rule.g.dart
@@ -14,9 +14,13 @@ LLMRule _$LLMRuleFromJson(Map<String, dynamic> json) => LLMRule(
   ),
   description: json['description'] as String,
   label: json['label'] as String,
-  severityRules: (json['severity_rules'] as List<dynamic>)
-      .map((e) => BodyguardSeverityRule.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  severityRules:
+      (json['severity_rules'] as List<dynamic>?)
+          ?.map(
+            (e) => BodyguardSeverityRule.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$LLMRuleToJson(LLMRule instance) => <String, dynamic>{
diff --git a/packages/stream_feeds/lib/src/generated/api/model/membership_level_response.dart b/packages/stream_feeds/lib/src/generated/api/model/membership_level_response.dart
index c3621e9a..5413d023 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/membership_level_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/membership_level_response.dart
@@ -48,6 +48,7 @@ class MembershipLevelResponse with _$MembershipLevelResponse {
   final int priority;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> tags;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/membership_level_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/membership_level_response.g.dart
index 574acd33..6f1ee345 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/membership_level_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/membership_level_response.g.dart
@@ -10,16 +10,16 @@ MembershipLevelResponse _$MembershipLevelResponseFromJson(
   Map<String, dynamic> json,
 ) => MembershipLevelResponse(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   custom: json['custom'] as Map<String, dynamic>?,
   description: json['description'] as String?,
   id: json['id'] as String,
   name: json['name'] as String,
   priority: (json['priority'] as num).toInt(),
-  tags: (json['tags'] as List<dynamic>).map((e) => e as String).toList(),
+  tags: (json['tags'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/message_response.dart b/packages/stream_feeds/lib/src/generated/api/model/message_response.dart
index 88cd1a88..d3c63554 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/message_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/message_response.dart
@@ -70,6 +70,7 @@ class MessageResponse with _$MessageResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<Attachment> attachments;
 
   @override
@@ -83,6 +84,7 @@ class MessageResponse with _$MessageResponse {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
@@ -111,6 +113,7 @@ class MessageResponse with _$MessageResponse {
   final Map<String, List<String>>? imageLabels;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ReactionResponse> latestReactions;
 
   @override
@@ -132,6 +135,7 @@ class MessageResponse with _$MessageResponse {
   final List<String>? mentionedRoles;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<UserResponse> mentionedUsers;
 
   @override
@@ -145,6 +149,7 @@ class MessageResponse with _$MessageResponse {
   final ModerationV2Response? moderation;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ReactionResponse> ownReactions;
 
   @override
@@ -177,12 +182,14 @@ class MessageResponse with _$MessageResponse {
   final String? quotedMessageId;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, int> reactionCounts;
 
   @override
   final Map<String, ReactionGroupResponse>? reactionGroups;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, int> reactionScores;
 
   @override
@@ -192,6 +199,7 @@ class MessageResponse with _$MessageResponse {
   final int replyCount;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> restrictedVisibility;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/message_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/message_response.g.dart
index 1bab4cb4..39941da7 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/message_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/message_response.g.dart
@@ -9,16 +9,16 @@ part of 'message_response.dart';
 MessageResponse _$MessageResponseFromJson(
   Map<String, dynamic> json,
 ) => MessageResponse(
-  attachments: (json['attachments'] as List<dynamic>)
-      .map((e) => Attachment.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  attachments:
+      (json['attachments'] as List<dynamic>?)?.map((e) => Attachment.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   cid: json['cid'] as String,
   command: json['command'] as String?,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -33,9 +33,11 @@ MessageResponse _$MessageResponseFromJson(
   imageLabels: (json['image_labels'] as Map<String, dynamic>?)?.map(
     (k, e) => MapEntry(k, (e as List<dynamic>).map((e) => e as String).toList()),
   ),
-  latestReactions: (json['latest_reactions'] as List<dynamic>)
-      .map((e) => ReactionResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  latestReactions:
+      (json['latest_reactions'] as List<dynamic>?)
+          ?.map((e) => ReactionResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   member: json['member'] == null ? null : ChannelMemberResponse.fromJson(json['member'] as Map<String, dynamic>),
   mentionedChannel: json['mentioned_channel'] as bool,
   mentionedGroupIds: (json['mentioned_group_ids'] as List<dynamic>?)?.map((e) => e as String).toList(),
@@ -44,10 +46,12 @@ MessageResponse _$MessageResponseFromJson(
       .toList(),
   mentionedHere: json['mentioned_here'] as bool,
   mentionedRoles: (json['mentioned_roles'] as List<dynamic>?)?.map((e) => e as String).toList(),
-  mentionedUsers: (json['mentioned_users'] as List<dynamic>)
-      .map((e) => UserResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
-  messageTextUpdatedAt: _$JsonConverterFromJson<int, DateTime>(
+  mentionedUsers:
+      (json['mentioned_users'] as List<dynamic>?)
+          ?.map((e) => UserResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
+  messageTextUpdatedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['message_text_updated_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -57,16 +61,18 @@ MessageResponse _$MessageResponseFromJson(
       : ModerationV2Response.fromJson(
           json['moderation'] as Map<String, dynamic>,
         ),
-  ownReactions: (json['own_reactions'] as List<dynamic>)
-      .map((e) => ReactionResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  ownReactions:
+      (json['own_reactions'] as List<dynamic>?)
+          ?.map((e) => ReactionResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   parentId: json['parent_id'] as String?,
-  pinExpires: _$JsonConverterFromJson<int, DateTime>(
+  pinExpires: _$JsonConverterFromJson<Object, DateTime>(
     json['pin_expires'],
     const EpochDateTimeConverter().fromJson,
   ),
   pinned: json['pinned'] as bool,
-  pinnedAt: _$JsonConverterFromJson<int, DateTime>(
+  pinnedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['pinned_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -79,14 +85,22 @@ MessageResponse _$MessageResponseFromJson(
           json['quoted_message'] as Map<String, dynamic>,
         ),
   quotedMessageId: json['quoted_message_id'] as String?,
-  reactionCounts: Map<String, int>.from(json['reaction_counts'] as Map),
+  reactionCounts:
+      (json['reaction_counts'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, (e as num).toInt()),
+      ) ??
+      {},
   reactionGroups: (json['reaction_groups'] as Map<String, dynamic>?)?.map(
     (k, e) => MapEntry(k, ReactionGroupResponse.fromJson(e as Map<String, dynamic>)),
   ),
-  reactionScores: Map<String, int>.from(json['reaction_scores'] as Map),
+  reactionScores:
+      (json['reaction_scores'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, (e as num).toInt()),
+      ) ??
+      {},
   reminder: json['reminder'] == null ? null : ReminderResponseData.fromJson(json['reminder'] as Map<String, dynamic>),
   replyCount: (json['reply_count'] as num).toInt(),
-  restrictedVisibility: (json['restricted_visibility'] as List<dynamic>).map((e) => e as String).toList(),
+  restrictedVisibility: (json['restricted_visibility'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   shadowed: json['shadowed'] as bool,
   sharedLocation: json['shared_location'] == null
       ? null
@@ -101,7 +115,7 @@ MessageResponse _$MessageResponseFromJson(
       .toList(),
   type: json['type'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: UserResponse.fromJson(json['user'] as Map<String, dynamic>),
 );
@@ -114,7 +128,7 @@ Map<String, dynamic> _$MessageResponseToJson(
   'command': instance.command,
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
@@ -133,7 +147,7 @@ Map<String, dynamic> _$MessageResponseToJson(
   'mentioned_here': instance.mentionedHere,
   'mentioned_roles': instance.mentionedRoles,
   'mentioned_users': instance.mentionedUsers.map((e) => e.toJson()).toList(),
-  'message_text_updated_at': _$JsonConverterToJson<int, DateTime>(
+  'message_text_updated_at': _$JsonConverterToJson<Object, DateTime>(
     instance.messageTextUpdatedAt,
     const EpochDateTimeConverter().toJson,
   ),
@@ -141,12 +155,12 @@ Map<String, dynamic> _$MessageResponseToJson(
   'moderation': instance.moderation?.toJson(),
   'own_reactions': instance.ownReactions.map((e) => e.toJson()).toList(),
   'parent_id': instance.parentId,
-  'pin_expires': _$JsonConverterToJson<int, DateTime>(
+  'pin_expires': _$JsonConverterToJson<Object, DateTime>(
     instance.pinExpires,
     const EpochDateTimeConverter().toJson,
   ),
   'pinned': instance.pinned,
-  'pinned_at': _$JsonConverterToJson<int, DateTime>(
+  'pinned_at': _$JsonConverterToJson<Object, DateTime>(
     instance.pinnedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/moderation_custom_action_event.dart b/packages/stream_feeds/lib/src/generated/api/model/moderation_custom_action_event.dart
index 199ce7b0..e4e29c6e 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/moderation_custom_action_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/moderation_custom_action_event.dart
@@ -39,6 +39,7 @@ class ModerationCustomActionEvent extends core.WsEvent with _$ModerationCustomAc
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/moderation_custom_action_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/moderation_custom_action_event.g.dart
index 4fff654a..6fbcde00 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/moderation_custom_action_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/moderation_custom_action_event.g.dart
@@ -12,11 +12,11 @@ ModerationCustomActionEvent _$ModerationCustomActionEventFromJson(
   actionId: json['action_id'] as String,
   actionOptions: json['action_options'] as Map<String, dynamic>?,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   message: json['message'] == null ? null : MessageResponse.fromJson(json['message'] as Map<String, dynamic>),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -34,7 +34,7 @@ Map<String, dynamic> _$ModerationCustomActionEventToJson(
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
   'message': instance.message?.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/moderation_flag_response.dart b/packages/stream_feeds/lib/src/generated/api/model/moderation_flag_response.dart
index 7bc41b8a..85ef9de7 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/moderation_flag_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/moderation_flag_response.dart
@@ -61,6 +61,7 @@ class ModerationFlagResponse with _$ModerationFlagResponse {
   final String? reason;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<Map<String, Object?>> result;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/moderation_flag_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/moderation_flag_response.g.dart
index d20a7846..116740c1 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/moderation_flag_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/moderation_flag_response.g.dart
@@ -10,7 +10,7 @@ ModerationFlagResponse _$ModerationFlagResponseFromJson(
   Map<String, dynamic> json,
 ) => ModerationFlagResponse(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   custom: json['custom'] as Map<String, dynamic>?,
   entityCreatorId: json['entity_creator_id'] as String?,
@@ -23,7 +23,7 @@ ModerationFlagResponse _$ModerationFlagResponseFromJson(
           json['moderation_payload'] as Map<String, dynamic>,
         ),
   reason: json['reason'] as String?,
-  result: (json['result'] as List<dynamic>).map((e) => e as Map<String, dynamic>).toList(),
+  result: (json['result'] as List<dynamic>?)?.map((e) => e as Map<String, dynamic>).toList() ?? [],
   reviewQueueItem: json['review_queue_item'] == null
       ? null
       : ReviewQueueItemResponse.fromJson(
@@ -32,7 +32,7 @@ ModerationFlagResponse _$ModerationFlagResponseFromJson(
   reviewQueueItemId: json['review_queue_item_id'] as String?,
   type: json['type'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: json['user'] == null ? null : UserResponse.fromJson(json['user'] as Map<String, dynamic>),
   userId: json['user_id'] as String,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/moderation_flagged_event.dart b/packages/stream_feeds/lib/src/generated/api/model/moderation_flagged_event.dart
index f443fc44..cae84411 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/moderation_flagged_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/moderation_flagged_event.dart
@@ -34,6 +34,7 @@ class ModerationFlaggedEvent extends core.WsEvent with _$ModerationFlaggedEvent
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/moderation_flagged_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/moderation_flagged_event.g.dart
index 22c85113..f1bc70cd 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/moderation_flagged_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/moderation_flagged_event.g.dart
@@ -11,11 +11,11 @@ ModerationFlaggedEvent _$ModerationFlaggedEventFromJson(
 ) => ModerationFlaggedEvent(
   contentType: json['content_type'] as String,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   objectId: json['object_id'] as String,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -29,7 +29,7 @@ Map<String, dynamic> _$ModerationFlaggedEventToJson(
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
   'object_id': instance.objectId,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/moderation_mark_reviewed_event.dart b/packages/stream_feeds/lib/src/generated/api/model/moderation_mark_reviewed_event.dart
index 945a5be8..28ec65e9 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/moderation_mark_reviewed_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/moderation_mark_reviewed_event.dart
@@ -31,6 +31,7 @@ class ModerationMarkReviewedEvent extends core.WsEvent with _$ModerationMarkRevi
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/moderation_mark_reviewed_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/moderation_mark_reviewed_event.g.dart
index 574264ec..be3cf423 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/moderation_mark_reviewed_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/moderation_mark_reviewed_event.g.dart
@@ -10,12 +10,12 @@ ModerationMarkReviewedEvent _$ModerationMarkReviewedEventFromJson(
   Map<String, dynamic> json,
 ) => ModerationMarkReviewedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   item: ReviewQueueItemResponse.fromJson(json['item'] as Map<String, dynamic>),
   message: json['message'] == null ? null : MessageResponse.fromJson(json['message'] as Map<String, dynamic>),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -29,7 +29,7 @@ Map<String, dynamic> _$ModerationMarkReviewedEventToJson(
   'custom': instance.custom,
   'item': instance.item.toJson(),
   'message': instance.message?.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/mute_request.dart b/packages/stream_feeds/lib/src/generated/api/model/mute_request.dart
index bd44356e..f1d30f39 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/mute_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/mute_request.dart
@@ -23,6 +23,7 @@ class MuteRequest with _$MuteRequest {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> targetIds;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/mute_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/mute_request.g.dart
index 248472c7..dc1ac7d9 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/mute_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/mute_request.g.dart
@@ -7,7 +7,7 @@ part of 'mute_request.dart';
 // **************************************************************************
 
 MuteRequest _$MuteRequestFromJson(Map<String, dynamic> json) => MuteRequest(
-  targetIds: (json['target_ids'] as List<dynamic>).map((e) => e as String).toList(),
+  targetIds: (json['target_ids'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   timeout: (json['timeout'] as num?)?.toInt(),
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/notification_feed_updated_event.dart b/packages/stream_feeds/lib/src/generated/api/model/notification_feed_updated_event.dart
index f51c8789..54a84212 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/notification_feed_updated_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/notification_feed_updated_event.dart
@@ -37,6 +37,7 @@ class NotificationFeedUpdatedEvent extends core.WsEvent with _$NotificationFeedU
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/notification_feed_updated_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/notification_feed_updated_event.g.dart
index d118fc61..4bcd7fa6 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/notification_feed_updated_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/notification_feed_updated_event.g.dart
@@ -15,9 +15,9 @@ NotificationFeedUpdatedEvent _$NotificationFeedUpdatedEventFromJson(
       )
       .toList(),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   notificationStatus: json['notification_status'] == null
@@ -25,7 +25,7 @@ NotificationFeedUpdatedEvent _$NotificationFeedUpdatedEventFromJson(
       : NotificationStatusResponse.fromJson(
           json['notification_status'] as Map<String, dynamic>,
         ),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -42,7 +42,7 @@ Map<String, dynamic> _$NotificationFeedUpdatedEventToJson(
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'notification_status': instance.notificationStatus?.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/notification_status_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/notification_status_response.g.dart
index 10b158a2..f2c6cdcb 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/notification_status_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/notification_status_response.g.dart
@@ -9,11 +9,11 @@ part of 'notification_status_response.dart';
 NotificationStatusResponse _$NotificationStatusResponseFromJson(
   Map<String, dynamic> json,
 ) => NotificationStatusResponse(
-  lastReadAt: _$JsonConverterFromJson<int, DateTime>(
+  lastReadAt: _$JsonConverterFromJson<Object, DateTime>(
     json['last_read_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  lastSeenAt: _$JsonConverterFromJson<int, DateTime>(
+  lastSeenAt: _$JsonConverterFromJson<Object, DateTime>(
     json['last_seen_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -26,11 +26,11 @@ NotificationStatusResponse _$NotificationStatusResponseFromJson(
 Map<String, dynamic> _$NotificationStatusResponseToJson(
   NotificationStatusResponse instance,
 ) => <String, dynamic>{
-  'last_read_at': _$JsonConverterToJson<int, DateTime>(
+  'last_read_at': _$JsonConverterToJson<Object, DateTime>(
     instance.lastReadAt,
     const EpochDateTimeConverter().toJson,
   ),
-  'last_seen_at': _$JsonConverterToJson<int, DateTime>(
+  'last_seen_at': _$JsonConverterToJson<Object, DateTime>(
     instance.lastSeenAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/own_batch_request.dart b/packages/stream_feeds/lib/src/generated/api/model/own_batch_request.dart
index 5e9c7bb3..4bfa82d8 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/own_batch_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/own_batch_request.dart
@@ -23,6 +23,7 @@ class OwnBatchRequest with _$OwnBatchRequest {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> feeds;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/own_batch_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/own_batch_request.g.dart
index 10e2aa07..7399e589 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/own_batch_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/own_batch_request.g.dart
@@ -6,8 +6,10 @@ part of 'own_batch_request.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-OwnBatchRequest _$OwnBatchRequestFromJson(Map<String, dynamic> json) => OwnBatchRequest(
-  feeds: (json['feeds'] as List<dynamic>).map((e) => e as String).toList(),
+OwnBatchRequest _$OwnBatchRequestFromJson(
+  Map<String, dynamic> json,
+) => OwnBatchRequest(
+  feeds: (json['feeds'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   fields: (json['fields'] as List<dynamic>?)?.map((e) => e as String).toList(),
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/own_batch_response.dart b/packages/stream_feeds/lib/src/generated/api/model/own_batch_response.dart
index 96a91981..f100c686 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/own_batch_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/own_batch_response.dart
@@ -23,6 +23,7 @@ class OwnBatchResponse with _$OwnBatchResponse {
   });
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, FeedOwnData> data;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/own_batch_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/own_batch_response.g.dart
index 85288b3c..36990048 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/own_batch_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/own_batch_response.g.dart
@@ -7,9 +7,11 @@ part of 'own_batch_response.dart';
 // **************************************************************************
 
 OwnBatchResponse _$OwnBatchResponseFromJson(Map<String, dynamic> json) => OwnBatchResponse(
-  data: (json['data'] as Map<String, dynamic>).map(
-    (k, e) => MapEntry(k, FeedOwnData.fromJson(e as Map<String, dynamic>)),
-  ),
+  data:
+      (json['data'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, FeedOwnData.fromJson(e as Map<String, dynamic>)),
+      ) ??
+      {},
   duration: json['duration'] as String,
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/own_user_response.dart b/packages/stream_feeds/lib/src/generated/api/model/own_user_response.dart
index 751d8b62..288c20d3 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/own_user_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/own_user_response.dart
@@ -60,6 +60,7 @@ class OwnUserResponse with _$OwnUserResponse {
   final List<String>? blockedUserIds;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ChannelMute> channelMutes;
 
   @override
@@ -67,6 +68,7 @@ class OwnUserResponse with _$OwnUserResponse {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
@@ -78,6 +80,7 @@ class OwnUserResponse with _$OwnUserResponse {
   final DateTime? deletedAt;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<DeviceResponse> devices;
 
   @override
@@ -100,6 +103,7 @@ class OwnUserResponse with _$OwnUserResponse {
   final List<String>? latestHiddenChannels;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<UserMuteResponse> mutes;
 
   @override
@@ -122,6 +126,7 @@ class OwnUserResponse with _$OwnUserResponse {
   final String role;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> teams;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/own_user_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/own_user_response.g.dart
index 9ecd08e5..75899e7a 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/own_user_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/own_user_response.g.dart
@@ -10,32 +10,36 @@ OwnUserResponse _$OwnUserResponseFromJson(Map<String, dynamic> json) => OwnUserR
   avgResponseTime: (json['avg_response_time'] as num?)?.toInt(),
   banned: json['banned'] as bool,
   blockedUserIds: (json['blocked_user_ids'] as List<dynamic>?)?.map((e) => e as String).toList(),
-  channelMutes: (json['channel_mutes'] as List<dynamic>)
-      .map((e) => ChannelMute.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  channelMutes:
+      (json['channel_mutes'] as List<dynamic>?)?.map((e) => ChannelMute.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
-  deactivatedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  deactivatedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deactivated_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  devices: (json['devices'] as List<dynamic>).map((e) => DeviceResponse.fromJson(e as Map<String, dynamic>)).toList(),
+  devices:
+      (json['devices'] as List<dynamic>?)?.map((e) => DeviceResponse.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   id: json['id'] as String,
   image: json['image'] as String?,
   invisible: json['invisible'] as bool,
   language: json['language'] as String,
-  lastActive: _$JsonConverterFromJson<int, DateTime>(
+  lastActive: _$JsonConverterFromJson<Object, DateTime>(
     json['last_active'],
     const EpochDateTimeConverter().fromJson,
   ),
   latestHiddenChannels: (json['latest_hidden_channels'] as List<dynamic>?)?.map((e) => e as String).toList(),
-  mutes: (json['mutes'] as List<dynamic>).map((e) => UserMuteResponse.fromJson(e as Map<String, dynamic>)).toList(),
+  mutes:
+      (json['mutes'] as List<dynamic>?)?.map((e) => UserMuteResponse.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   name: json['name'] as String?,
   online: json['online'] as bool,
   privacySettings: json['privacy_settings'] == null
@@ -48,12 +52,12 @@ OwnUserResponse _$OwnUserResponseFromJson(Map<String, dynamic> json) => OwnUserR
       : PushPreferencesResponse.fromJson(
           json['push_preferences'] as Map<String, dynamic>,
         ),
-  revokeTokensIssuedBefore: _$JsonConverterFromJson<int, DateTime>(
+  revokeTokensIssuedBefore: _$JsonConverterFromJson<Object, DateTime>(
     json['revoke_tokens_issued_before'],
     const EpochDateTimeConverter().fromJson,
   ),
   role: json['role'] as String,
-  teams: (json['teams'] as List<dynamic>).map((e) => e as String).toList(),
+  teams: (json['teams'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   teamsRole: (json['teams_role'] as Map<String, dynamic>?)?.map(
     (k, e) => MapEntry(k, e as String),
   ),
@@ -65,7 +69,7 @@ OwnUserResponse _$OwnUserResponseFromJson(Map<String, dynamic> json) => OwnUserR
   unreadCount: (json['unread_count'] as num).toInt(),
   unreadThreads: (json['unread_threads'] as num).toInt(),
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
 );
 
@@ -76,11 +80,11 @@ Map<String, dynamic> _$OwnUserResponseToJson(OwnUserResponse instance) => <Strin
   'channel_mutes': instance.channelMutes.map((e) => e.toJson()).toList(),
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'deactivated_at': _$JsonConverterToJson<int, DateTime>(
+  'deactivated_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deactivatedAt,
     const EpochDateTimeConverter().toJson,
   ),
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
@@ -89,7 +93,7 @@ Map<String, dynamic> _$OwnUserResponseToJson(OwnUserResponse instance) => <Strin
   'image': instance.image,
   'invisible': instance.invisible,
   'language': instance.language,
-  'last_active': _$JsonConverterToJson<int, DateTime>(
+  'last_active': _$JsonConverterToJson<Object, DateTime>(
     instance.lastActive,
     const EpochDateTimeConverter().toJson,
   ),
@@ -99,7 +103,7 @@ Map<String, dynamic> _$OwnUserResponseToJson(OwnUserResponse instance) => <Strin
   'online': instance.online,
   'privacy_settings': instance.privacySettings?.toJson(),
   'push_preferences': instance.pushPreferences?.toJson(),
-  'revoke_tokens_issued_before': _$JsonConverterToJson<int, DateTime>(
+  'revoke_tokens_issued_before': _$JsonConverterToJson<Object, DateTime>(
     instance.revokeTokensIssuedBefore,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/pin_activity_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/pin_activity_response.g.dart
index a7b2555e..24bb14d9 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/pin_activity_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/pin_activity_response.g.dart
@@ -11,7 +11,7 @@ PinActivityResponse _$PinActivityResponseFromJson(Map<String, dynamic> json) =>
     json['activity'] as Map<String, dynamic>,
   ),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   duration: json['duration'] as String,
   feed: json['feed'] as String,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/poll_closed_feed_event.dart b/packages/stream_feeds/lib/src/generated/api/model/poll_closed_feed_event.dart
index 9318d5e1..16c59fbc 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/poll_closed_feed_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/poll_closed_feed_event.dart
@@ -32,6 +32,7 @@ class PollClosedFeedEvent extends core.WsEvent with _$PollClosedFeedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/poll_closed_feed_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/poll_closed_feed_event.g.dart
index 1848f16a..8f1c1701 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/poll_closed_feed_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/poll_closed_feed_event.g.dart
@@ -8,13 +8,13 @@ part of 'poll_closed_feed_event.dart';
 
 PollClosedFeedEvent _$PollClosedFeedEventFromJson(Map<String, dynamic> json) => PollClosedFeedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   poll: PollResponseData.fromJson(json['poll'] as Map<String, dynamic>),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -29,7 +29,7 @@ Map<String, dynamic> _$PollClosedFeedEventToJson(
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'poll': instance.poll.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/poll_deleted_feed_event.dart b/packages/stream_feeds/lib/src/generated/api/model/poll_deleted_feed_event.dart
index 6763428e..ce5c13ae 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/poll_deleted_feed_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/poll_deleted_feed_event.dart
@@ -32,6 +32,7 @@ class PollDeletedFeedEvent extends core.WsEvent with _$PollDeletedFeedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/poll_deleted_feed_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/poll_deleted_feed_event.g.dart
index a303c74c..383fc22a 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/poll_deleted_feed_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/poll_deleted_feed_event.g.dart
@@ -10,13 +10,13 @@ PollDeletedFeedEvent _$PollDeletedFeedEventFromJson(
   Map<String, dynamic> json,
 ) => PollDeletedFeedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   poll: PollResponseData.fromJson(json['poll'] as Map<String, dynamic>),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -31,7 +31,7 @@ Map<String, dynamic> _$PollDeletedFeedEventToJson(
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'poll': instance.poll.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/poll_option_response_data.dart b/packages/stream_feeds/lib/src/generated/api/model/poll_option_response_data.dart
index 19429c59..f49f7ddd 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/poll_option_response_data.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/poll_option_response_data.dart
@@ -24,6 +24,7 @@ class PollOptionResponseData with _$PollOptionResponseData {
   });
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/poll_option_response_data.g.dart b/packages/stream_feeds/lib/src/generated/api/model/poll_option_response_data.g.dart
index 8cb55c09..d4165095 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/poll_option_response_data.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/poll_option_response_data.g.dart
@@ -9,7 +9,7 @@ part of 'poll_option_response_data.dart';
 PollOptionResponseData _$PollOptionResponseDataFromJson(
   Map<String, dynamic> json,
 ) => PollOptionResponseData(
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   id: json['id'] as String,
   text: json['text'] as String,
 );
diff --git a/packages/stream_feeds/lib/src/generated/api/model/poll_response_data.dart b/packages/stream_feeds/lib/src/generated/api/model/poll_response_data.dart
index bcbafda8..8a23d28f 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/poll_response_data.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/poll_response_data.dart
@@ -61,6 +61,7 @@ class PollResponseData with _$PollResponseData {
   final String createdById;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
@@ -76,9 +77,11 @@ class PollResponseData with _$PollResponseData {
   final bool? isClosed;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<PollVoteResponseData> latestAnswers;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, List<PollVoteResponseData>> latestVotesByOption;
 
   @override
@@ -88,9 +91,11 @@ class PollResponseData with _$PollResponseData {
   final String name;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<PollOptionResponseData> options;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<PollVoteResponseData> ownVotes;
 
   @override
@@ -101,6 +106,7 @@ class PollResponseData with _$PollResponseData {
   final int voteCount;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, int> voteCountsByOption;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/poll_response_data.g.dart b/packages/stream_feeds/lib/src/generated/api/model/poll_response_data.g.dart
index 31439532..c03521df 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/poll_response_data.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/poll_response_data.g.dart
@@ -13,43 +13,55 @@ PollResponseData _$PollResponseDataFromJson(
   allowUserSuggestedOptions: json['allow_user_suggested_options'] as bool,
   answersCount: (json['answers_count'] as num).toInt(),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   createdBy: json['created_by'] == null ? null : UserResponse.fromJson(json['created_by'] as Map<String, dynamic>),
   createdById: json['created_by_id'] as String,
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   description: json['description'] as String,
   enforceUniqueVote: json['enforce_unique_vote'] as bool,
   id: json['id'] as String,
   isClosed: json['is_closed'] as bool?,
-  latestAnswers: (json['latest_answers'] as List<dynamic>)
-      .map((e) => PollVoteResponseData.fromJson(e as Map<String, dynamic>))
-      .toList(),
-  latestVotesByOption: (json['latest_votes_by_option'] as Map<String, dynamic>).map(
-    (k, e) => MapEntry(
-      k,
-      (e as List<dynamic>)
-          .map(
-            (e) => PollVoteResponseData.fromJson(e as Map<String, dynamic>),
-          )
-          .toList(),
-    ),
-  ),
+  latestAnswers:
+      (json['latest_answers'] as List<dynamic>?)
+          ?.map((e) => PollVoteResponseData.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
+  latestVotesByOption:
+      (json['latest_votes_by_option'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          k,
+          (e as List<dynamic>)
+              .map(
+                (e) => PollVoteResponseData.fromJson(e as Map<String, dynamic>),
+              )
+              .toList(),
+        ),
+      ) ??
+      {},
   maxVotesAllowed: (json['max_votes_allowed'] as num?)?.toInt(),
   name: json['name'] as String,
-  options: (json['options'] as List<dynamic>)
-      .map((e) => PollOptionResponseData.fromJson(e as Map<String, dynamic>))
-      .toList(),
-  ownVotes: (json['own_votes'] as List<dynamic>)
-      .map((e) => PollVoteResponseData.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  options:
+      (json['options'] as List<dynamic>?)
+          ?.map(
+            (e) => PollOptionResponseData.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
+  ownVotes:
+      (json['own_votes'] as List<dynamic>?)
+          ?.map((e) => PollVoteResponseData.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   voteCount: (json['vote_count'] as num).toInt(),
-  voteCountsByOption: Map<String, int>.from(
-    json['vote_counts_by_option'] as Map,
-  ),
+  voteCountsByOption:
+      (json['vote_counts_by_option'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, (e as num).toInt()),
+      ) ??
+      {},
   votingVisibility: json['voting_visibility'] as String,
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/poll_updated_feed_event.dart b/packages/stream_feeds/lib/src/generated/api/model/poll_updated_feed_event.dart
index f7302caf..c0a9f2f9 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/poll_updated_feed_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/poll_updated_feed_event.dart
@@ -32,6 +32,7 @@ class PollUpdatedFeedEvent extends core.WsEvent with _$PollUpdatedFeedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/poll_updated_feed_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/poll_updated_feed_event.g.dart
index 7ff4049e..b9b46d92 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/poll_updated_feed_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/poll_updated_feed_event.g.dart
@@ -10,13 +10,13 @@ PollUpdatedFeedEvent _$PollUpdatedFeedEventFromJson(
   Map<String, dynamic> json,
 ) => PollUpdatedFeedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   poll: PollResponseData.fromJson(json['poll'] as Map<String, dynamic>),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -31,7 +31,7 @@ Map<String, dynamic> _$PollUpdatedFeedEventToJson(
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
   'poll': instance.poll.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/poll_vote_casted_feed_event.dart b/packages/stream_feeds/lib/src/generated/api/model/poll_vote_casted_feed_event.dart
index 9c5b7324..6ace5f68 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/poll_vote_casted_feed_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/poll_vote_casted_feed_event.dart
@@ -33,6 +33,7 @@ class PollVoteCastedFeedEvent extends core.WsEvent with _$PollVoteCastedFeedEven
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/poll_vote_casted_feed_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/poll_vote_casted_feed_event.g.dart
index bd0dbfe3..31ec1009 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/poll_vote_casted_feed_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/poll_vote_casted_feed_event.g.dart
@@ -10,16 +10,16 @@ PollVoteCastedFeedEvent _$PollVoteCastedFeedEventFromJson(
   Map<String, dynamic> json,
 ) => PollVoteCastedFeedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   poll: PollResponseData.fromJson(json['poll'] as Map<String, dynamic>),
   pollVote: PollVoteResponseData.fromJson(
     json['poll_vote'] as Map<String, dynamic>,
   ),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -35,7 +35,7 @@ Map<String, dynamic> _$PollVoteCastedFeedEventToJson(
   'fid': instance.fid,
   'poll': instance.poll.toJson(),
   'poll_vote': instance.pollVote.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/poll_vote_changed_feed_event.dart b/packages/stream_feeds/lib/src/generated/api/model/poll_vote_changed_feed_event.dart
index c9b89c23..bba99d85 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/poll_vote_changed_feed_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/poll_vote_changed_feed_event.dart
@@ -33,6 +33,7 @@ class PollVoteChangedFeedEvent extends core.WsEvent with _$PollVoteChangedFeedEv
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/poll_vote_changed_feed_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/poll_vote_changed_feed_event.g.dart
index 2f40c642..1caf26ce 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/poll_vote_changed_feed_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/poll_vote_changed_feed_event.g.dart
@@ -10,16 +10,16 @@ PollVoteChangedFeedEvent _$PollVoteChangedFeedEventFromJson(
   Map<String, dynamic> json,
 ) => PollVoteChangedFeedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   poll: PollResponseData.fromJson(json['poll'] as Map<String, dynamic>),
   pollVote: PollVoteResponseData.fromJson(
     json['poll_vote'] as Map<String, dynamic>,
   ),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -35,7 +35,7 @@ Map<String, dynamic> _$PollVoteChangedFeedEventToJson(
   'fid': instance.fid,
   'poll': instance.poll.toJson(),
   'poll_vote': instance.pollVote.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/poll_vote_removed_feed_event.dart b/packages/stream_feeds/lib/src/generated/api/model/poll_vote_removed_feed_event.dart
index cf1381a1..133920a7 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/poll_vote_removed_feed_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/poll_vote_removed_feed_event.dart
@@ -33,6 +33,7 @@ class PollVoteRemovedFeedEvent extends core.WsEvent with _$PollVoteRemovedFeedEv
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/poll_vote_removed_feed_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/poll_vote_removed_feed_event.g.dart
index 6807518a..ce11f63f 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/poll_vote_removed_feed_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/poll_vote_removed_feed_event.g.dart
@@ -10,16 +10,16 @@ PollVoteRemovedFeedEvent _$PollVoteRemovedFeedEventFromJson(
   Map<String, dynamic> json,
 ) => PollVoteRemovedFeedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
   poll: PollResponseData.fromJson(json['poll'] as Map<String, dynamic>),
   pollVote: PollVoteResponseData.fromJson(
     json['poll_vote'] as Map<String, dynamic>,
   ),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -35,7 +35,7 @@ Map<String, dynamic> _$PollVoteRemovedFeedEventToJson(
   'fid': instance.fid,
   'poll': instance.poll.toJson(),
   'poll_vote': instance.pollVote.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/poll_vote_response_data.g.dart b/packages/stream_feeds/lib/src/generated/api/model/poll_vote_response_data.g.dart
index 1253e783..90da9e43 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/poll_vote_response_data.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/poll_vote_response_data.g.dart
@@ -11,14 +11,14 @@ PollVoteResponseData _$PollVoteResponseDataFromJson(
 ) => PollVoteResponseData(
   answerText: json['answer_text'] as String?,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   id: json['id'] as String,
   isAnswer: json['is_answer'] as bool?,
   optionId: json['option_id'] as String,
   pollId: json['poll_id'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: json['user'] == null ? null : UserResponse.fromJson(json['user'] as Map<String, dynamic>),
   userId: json['user_id'] as String?,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/poll_votes_response.dart b/packages/stream_feeds/lib/src/generated/api/model/poll_votes_response.dart
index 6ee448c6..0a7b1665 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/poll_votes_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/poll_votes_response.dart
@@ -34,6 +34,7 @@ class PollVotesResponse with _$PollVotesResponse {
   final String? prev;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<PollVoteResponseData> votes;
 
   Map<String, dynamic> toJson() => _$PollVotesResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/poll_votes_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/poll_votes_response.g.dart
index 78676909..2a8cec8c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/poll_votes_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/poll_votes_response.g.dart
@@ -10,7 +10,13 @@ PollVotesResponse _$PollVotesResponseFromJson(Map<String, dynamic> json) => Poll
   duration: json['duration'] as String,
   next: json['next'] as String?,
   prev: json['prev'] as String?,
-  votes: (json['votes'] as List<dynamic>).map((e) => PollVoteResponseData.fromJson(e as Map<String, dynamic>)).toList(),
+  votes:
+      (json['votes'] as List<dynamic>?)
+          ?.map(
+            (e) => PollVoteResponseData.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$PollVotesResponseToJson(PollVotesResponse instance) => <String, dynamic>{
diff --git a/packages/stream_feeds/lib/src/generated/api/model/push_preference_input.g.dart b/packages/stream_feeds/lib/src/generated/api/model/push_preference_input.g.dart
index ff463c5a..b8343297 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/push_preference_input.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/push_preference_input.g.dart
@@ -23,7 +23,7 @@ PushPreferenceInput _$PushPreferenceInputFromJson(Map<String, dynamic> json) =>
       : ChatPreferencesInput.fromJson(
           json['chat_preferences'] as Map<String, dynamic>,
         ),
-  disabledUntil: _$JsonConverterFromJson<int, DateTime>(
+  disabledUntil: _$JsonConverterFromJson<Object, DateTime>(
     json['disabled_until'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -48,7 +48,7 @@ Map<String, dynamic> _$PushPreferenceInputToJson(
   'channel_cid': instance.channelCid,
   'chat_level': _$PushPreferenceInputChatLevelEnumMap[instance.chatLevel],
   'chat_preferences': instance.chatPreferences?.toJson(),
-  'disabled_until': _$JsonConverterToJson<int, DateTime>(
+  'disabled_until': _$JsonConverterToJson<Object, DateTime>(
     instance.disabledUntil,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/push_preferences_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/push_preferences_response.g.dart
index 7e25077d..332de57f 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/push_preferences_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/push_preferences_response.g.dart
@@ -16,7 +16,7 @@ PushPreferencesResponse _$PushPreferencesResponseFromJson(
       : ChatPreferencesResponse.fromJson(
           json['chat_preferences'] as Map<String, dynamic>,
         ),
-  disabledUntil: _$JsonConverterFromJson<int, DateTime>(
+  disabledUntil: _$JsonConverterFromJson<Object, DateTime>(
     json['disabled_until'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -34,7 +34,7 @@ Map<String, dynamic> _$PushPreferencesResponseToJson(
   'call_level': instance.callLevel,
   'chat_level': instance.chatLevel,
   'chat_preferences': instance.chatPreferences?.toJson(),
-  'disabled_until': _$JsonConverterToJson<int, DateTime>(
+  'disabled_until': _$JsonConverterToJson<Object, DateTime>(
     instance.disabledUntil,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_activities_response.dart b/packages/stream_feeds/lib/src/generated/api/model/query_activities_response.dart
index 821547d5..f2f1bd55 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_activities_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_activities_response.dart
@@ -25,6 +25,7 @@ class QueryActivitiesResponse with _$QueryActivitiesResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ActivityResponse> activities;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_activities_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/query_activities_response.g.dart
index bb6df298..13b41a43 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_activities_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_activities_response.g.dart
@@ -9,9 +9,11 @@ part of 'query_activities_response.dart';
 QueryActivitiesResponse _$QueryActivitiesResponseFromJson(
   Map<String, dynamic> json,
 ) => QueryActivitiesResponse(
-  activities: (json['activities'] as List<dynamic>)
-      .map((e) => ActivityResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  activities:
+      (json['activities'] as List<dynamic>?)
+          ?.map((e) => ActivityResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   duration: json['duration'] as String,
   next: json['next'] as String?,
   prev: json['prev'] as String?,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_activity_reactions_response.dart b/packages/stream_feeds/lib/src/generated/api/model/query_activity_reactions_response.dart
index ad06186b..91a27ef9 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_activity_reactions_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_activity_reactions_response.dart
@@ -34,6 +34,7 @@ class QueryActivityReactionsResponse with _$QueryActivityReactionsResponse {
   final String? prev;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedsReactionResponse> reactions;
 
   Map<String, dynamic> toJson() => _$QueryActivityReactionsResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_activity_reactions_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/query_activity_reactions_response.g.dart
index ad5168db..ff4211de 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_activity_reactions_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_activity_reactions_response.g.dart
@@ -12,9 +12,13 @@ QueryActivityReactionsResponse _$QueryActivityReactionsResponseFromJson(
   duration: json['duration'] as String,
   next: json['next'] as String?,
   prev: json['prev'] as String?,
-  reactions: (json['reactions'] as List<dynamic>)
-      .map((e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  reactions:
+      (json['reactions'] as List<dynamic>?)
+          ?.map(
+            (e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$QueryActivityReactionsResponseToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_appeals_response.dart b/packages/stream_feeds/lib/src/generated/api/model/query_appeals_response.dart
index 40251892..d39e7017 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_appeals_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_appeals_response.dart
@@ -28,6 +28,7 @@ class QueryAppealsResponse with _$QueryAppealsResponse {
   final String duration;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<AppealItemResponse> items;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_appeals_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/query_appeals_response.g.dart
index 84ed2c00..3c37ebe4 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_appeals_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_appeals_response.g.dart
@@ -10,7 +10,9 @@ QueryAppealsResponse _$QueryAppealsResponseFromJson(
   Map<String, dynamic> json,
 ) => QueryAppealsResponse(
   duration: json['duration'] as String,
-  items: (json['items'] as List<dynamic>).map((e) => AppealItemResponse.fromJson(e as Map<String, dynamic>)).toList(),
+  items:
+      (json['items'] as List<dynamic>?)?.map((e) => AppealItemResponse.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   next: json['next'] as String?,
   prev: json['prev'] as String?,
 );
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_bookmark_folders_response.dart b/packages/stream_feeds/lib/src/generated/api/model/query_bookmark_folders_response.dart
index b4506f3c..2276ce22 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_bookmark_folders_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_bookmark_folders_response.dart
@@ -25,6 +25,7 @@ class QueryBookmarkFoldersResponse with _$QueryBookmarkFoldersResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<BookmarkFolderResponse> bookmarkFolders;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_bookmark_folders_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/query_bookmark_folders_response.g.dart
index 347e0ca9..67257a23 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_bookmark_folders_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_bookmark_folders_response.g.dart
@@ -9,9 +9,13 @@ part of 'query_bookmark_folders_response.dart';
 QueryBookmarkFoldersResponse _$QueryBookmarkFoldersResponseFromJson(
   Map<String, dynamic> json,
 ) => QueryBookmarkFoldersResponse(
-  bookmarkFolders: (json['bookmark_folders'] as List<dynamic>)
-      .map((e) => BookmarkFolderResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  bookmarkFolders:
+      (json['bookmark_folders'] as List<dynamic>?)
+          ?.map(
+            (e) => BookmarkFolderResponse.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
   duration: json['duration'] as String,
   next: json['next'] as String?,
   prev: json['prev'] as String?,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_bookmarks_response.dart b/packages/stream_feeds/lib/src/generated/api/model/query_bookmarks_response.dart
index dfc4cde5..12f3fa52 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_bookmarks_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_bookmarks_response.dart
@@ -25,6 +25,7 @@ class QueryBookmarksResponse with _$QueryBookmarksResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<BookmarkResponse> bookmarks;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_bookmarks_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/query_bookmarks_response.g.dart
index 1be26463..9eaa560b 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_bookmarks_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_bookmarks_response.g.dart
@@ -9,9 +9,11 @@ part of 'query_bookmarks_response.dart';
 QueryBookmarksResponse _$QueryBookmarksResponseFromJson(
   Map<String, dynamic> json,
 ) => QueryBookmarksResponse(
-  bookmarks: (json['bookmarks'] as List<dynamic>)
-      .map((e) => BookmarkResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  bookmarks:
+      (json['bookmarks'] as List<dynamic>?)
+          ?.map((e) => BookmarkResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   duration: json['duration'] as String,
   next: json['next'] as String?,
   prev: json['prev'] as String?,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_collections_response.dart b/packages/stream_feeds/lib/src/generated/api/model/query_collections_response.dart
index a76172ad..8691753d 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_collections_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_collections_response.dart
@@ -25,6 +25,7 @@ class QueryCollectionsResponse with _$QueryCollectionsResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<CollectionResponse> collections;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_collections_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/query_collections_response.g.dart
index 3e45ec78..9d290081 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_collections_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_collections_response.g.dart
@@ -9,9 +9,11 @@ part of 'query_collections_response.dart';
 QueryCollectionsResponse _$QueryCollectionsResponseFromJson(
   Map<String, dynamic> json,
 ) => QueryCollectionsResponse(
-  collections: (json['collections'] as List<dynamic>)
-      .map((e) => CollectionResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  collections:
+      (json['collections'] as List<dynamic>?)
+          ?.map((e) => CollectionResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   duration: json['duration'] as String,
   next: json['next'] as String?,
   prev: json['prev'] as String?,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_comment_reactions_response.dart b/packages/stream_feeds/lib/src/generated/api/model/query_comment_reactions_response.dart
index 207e67e0..073550af 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_comment_reactions_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_comment_reactions_response.dart
@@ -34,6 +34,7 @@ class QueryCommentReactionsResponse with _$QueryCommentReactionsResponse {
   final String? prev;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedsReactionResponse> reactions;
 
   Map<String, dynamic> toJson() => _$QueryCommentReactionsResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_comment_reactions_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/query_comment_reactions_response.g.dart
index 2b2c0027..09cac29d 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_comment_reactions_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_comment_reactions_response.g.dart
@@ -12,9 +12,13 @@ QueryCommentReactionsResponse _$QueryCommentReactionsResponseFromJson(
   duration: json['duration'] as String,
   next: json['next'] as String?,
   prev: json['prev'] as String?,
-  reactions: (json['reactions'] as List<dynamic>)
-      .map((e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  reactions:
+      (json['reactions'] as List<dynamic>?)
+          ?.map(
+            (e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$QueryCommentReactionsResponseToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_comments_request.dart b/packages/stream_feeds/lib/src/generated/api/model/query_comments_request.dart
index 7d59cde3..ad91a3b5 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_comments_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_comments_request.dart
@@ -43,6 +43,7 @@ class QueryCommentsRequest with _$QueryCommentsRequest {
   });
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> filter;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_comments_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/query_comments_request.g.dart
index 65ee9e97..bc101db1 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_comments_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_comments_request.g.dart
@@ -9,7 +9,7 @@ part of 'query_comments_request.dart';
 QueryCommentsRequest _$QueryCommentsRequestFromJson(
   Map<String, dynamic> json,
 ) => QueryCommentsRequest(
-  filter: json['filter'] as Map<String, dynamic>,
+  filter: json['filter'] as Map<String, dynamic>? ?? {},
   idAround: json['id_around'] as String?,
   limit: (json['limit'] as num?)?.toInt(),
   next: json['next'] as String?,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_comments_response.dart b/packages/stream_feeds/lib/src/generated/api/model/query_comments_response.dart
index 89388087..a9a85067 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_comments_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_comments_response.dart
@@ -25,6 +25,7 @@ class QueryCommentsResponse with _$QueryCommentsResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<CommentResponse> comments;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_comments_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/query_comments_response.g.dart
index 05d948b1..7ad19f0e 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_comments_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_comments_response.g.dart
@@ -9,9 +9,9 @@ part of 'query_comments_response.dart';
 QueryCommentsResponse _$QueryCommentsResponseFromJson(
   Map<String, dynamic> json,
 ) => QueryCommentsResponse(
-  comments: (json['comments'] as List<dynamic>)
-      .map((e) => CommentResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  comments:
+      (json['comments'] as List<dynamic>?)?.map((e) => CommentResponse.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   duration: json['duration'] as String,
   next: json['next'] as String?,
   prev: json['prev'] as String?,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_feed_members_response.dart b/packages/stream_feeds/lib/src/generated/api/model/query_feed_members_response.dart
index 95bf6731..b11efce6 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_feed_members_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_feed_members_response.dart
@@ -28,6 +28,7 @@ class QueryFeedMembersResponse with _$QueryFeedMembersResponse {
   final String duration;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedMemberResponse> members;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_feed_members_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/query_feed_members_response.g.dart
index 41ed2ad6..7542ee20 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_feed_members_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_feed_members_response.g.dart
@@ -10,9 +10,11 @@ QueryFeedMembersResponse _$QueryFeedMembersResponseFromJson(
   Map<String, dynamic> json,
 ) => QueryFeedMembersResponse(
   duration: json['duration'] as String,
-  members: (json['members'] as List<dynamic>)
-      .map((e) => FeedMemberResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  members:
+      (json['members'] as List<dynamic>?)
+          ?.map((e) => FeedMemberResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   next: json['next'] as String?,
   prev: json['prev'] as String?,
 );
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_feeds_response.dart b/packages/stream_feeds/lib/src/generated/api/model/query_feeds_response.dart
index 899eaa26..6fe3f1df 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_feeds_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_feeds_response.dart
@@ -28,6 +28,7 @@ class QueryFeedsResponse with _$QueryFeedsResponse {
   final String duration;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedResponse> feeds;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_feeds_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/query_feeds_response.g.dart
index cd7db316..567b41fa 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_feeds_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_feeds_response.g.dart
@@ -8,7 +8,7 @@ part of 'query_feeds_response.dart';
 
 QueryFeedsResponse _$QueryFeedsResponseFromJson(Map<String, dynamic> json) => QueryFeedsResponse(
   duration: json['duration'] as String,
-  feeds: (json['feeds'] as List<dynamic>).map((e) => FeedResponse.fromJson(e as Map<String, dynamic>)).toList(),
+  feeds: (json['feeds'] as List<dynamic>?)?.map((e) => FeedResponse.fromJson(e as Map<String, dynamic>)).toList() ?? [],
   next: json['next'] as String?,
   prev: json['prev'] as String?,
 );
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_follows_response.dart b/packages/stream_feeds/lib/src/generated/api/model/query_follows_response.dart
index 8dccb9ee..0f417809 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_follows_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_follows_response.dart
@@ -28,6 +28,7 @@ class QueryFollowsResponse with _$QueryFollowsResponse {
   final String duration;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FollowResponse> follows;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_follows_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/query_follows_response.g.dart
index b2cbaadf..d97d882c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_follows_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_follows_response.g.dart
@@ -10,7 +10,9 @@ QueryFollowsResponse _$QueryFollowsResponseFromJson(
   Map<String, dynamic> json,
 ) => QueryFollowsResponse(
   duration: json['duration'] as String,
-  follows: (json['follows'] as List<dynamic>).map((e) => FollowResponse.fromJson(e as Map<String, dynamic>)).toList(),
+  follows:
+      (json['follows'] as List<dynamic>?)?.map((e) => FollowResponse.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   next: json['next'] as String?,
   prev: json['prev'] as String?,
 );
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_moderation_configs_response.dart b/packages/stream_feeds/lib/src/generated/api/model/query_moderation_configs_response.dart
index 8424e759..3b3d70f2 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_moderation_configs_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_moderation_configs_response.dart
@@ -25,6 +25,7 @@ class QueryModerationConfigsResponse with _$QueryModerationConfigsResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ConfigResponse> configs;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_moderation_configs_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/query_moderation_configs_response.g.dart
index c07b1ecf..3d0a2b74 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_moderation_configs_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_moderation_configs_response.g.dart
@@ -9,7 +9,9 @@ part of 'query_moderation_configs_response.dart';
 QueryModerationConfigsResponse _$QueryModerationConfigsResponseFromJson(
   Map<String, dynamic> json,
 ) => QueryModerationConfigsResponse(
-  configs: (json['configs'] as List<dynamic>).map((e) => ConfigResponse.fromJson(e as Map<String, dynamic>)).toList(),
+  configs:
+      (json['configs'] as List<dynamic>?)?.map((e) => ConfigResponse.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   duration: json['duration'] as String,
   next: json['next'] as String?,
   prev: json['prev'] as String?,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_pinned_activities_response.dart b/packages/stream_feeds/lib/src/generated/api/model/query_pinned_activities_response.dart
index f09046ed..c73fb20f 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_pinned_activities_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_pinned_activities_response.dart
@@ -31,6 +31,7 @@ class QueryPinnedActivitiesResponse with _$QueryPinnedActivitiesResponse {
   final String? next;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ActivityPinResponse> pinnedActivities;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_pinned_activities_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/query_pinned_activities_response.g.dart
index ee93c0ab..553eed13 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_pinned_activities_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_pinned_activities_response.g.dart
@@ -11,9 +11,11 @@ QueryPinnedActivitiesResponse _$QueryPinnedActivitiesResponseFromJson(
 ) => QueryPinnedActivitiesResponse(
   duration: json['duration'] as String,
   next: json['next'] as String?,
-  pinnedActivities: (json['pinned_activities'] as List<dynamic>)
-      .map((e) => ActivityPinResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  pinnedActivities:
+      (json['pinned_activities'] as List<dynamic>?)
+          ?.map((e) => ActivityPinResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   prev: json['prev'] as String?,
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_polls_response.dart b/packages/stream_feeds/lib/src/generated/api/model/query_polls_response.dart
index d1a28d40..26efc9c5 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_polls_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_polls_response.dart
@@ -31,6 +31,7 @@ class QueryPollsResponse with _$QueryPollsResponse {
   final String? next;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<PollResponseData> polls;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_polls_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/query_polls_response.g.dart
index e0a47aa4..6ee1bb23 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_polls_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_polls_response.g.dart
@@ -9,7 +9,9 @@ part of 'query_polls_response.dart';
 QueryPollsResponse _$QueryPollsResponseFromJson(Map<String, dynamic> json) => QueryPollsResponse(
   duration: json['duration'] as String,
   next: json['next'] as String?,
-  polls: (json['polls'] as List<dynamic>).map((e) => PollResponseData.fromJson(e as Map<String, dynamic>)).toList(),
+  polls:
+      (json['polls'] as List<dynamic>?)?.map((e) => PollResponseData.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   prev: json['prev'] as String?,
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_review_queue_response.dart b/packages/stream_feeds/lib/src/generated/api/model/query_review_queue_response.dart
index fdd4de90..de338188 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_review_queue_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_review_queue_response.dart
@@ -29,6 +29,7 @@ class QueryReviewQueueResponse with _$QueryReviewQueueResponse {
   });
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, List<ModerationActionConfigResponse>> actionConfig;
 
   @override
@@ -41,6 +42,7 @@ class QueryReviewQueueResponse with _$QueryReviewQueueResponse {
   final FilterConfigResponse? filterConfig;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ReviewQueueItemResponse> items;
 
   @override
@@ -50,6 +52,7 @@ class QueryReviewQueueResponse with _$QueryReviewQueueResponse {
   final String? prev;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> stats;
 
   Map<String, dynamic> toJson() => _$QueryReviewQueueResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_review_queue_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/query_review_queue_response.g.dart
index c61a5bca..3e1945ba 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_review_queue_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_review_queue_response.g.dart
@@ -9,18 +9,20 @@ part of 'query_review_queue_response.dart';
 QueryReviewQueueResponse _$QueryReviewQueueResponseFromJson(
   Map<String, dynamic> json,
 ) => QueryReviewQueueResponse(
-  actionConfig: (json['action_config'] as Map<String, dynamic>).map(
-    (k, e) => MapEntry(
-      k,
-      (e as List<dynamic>)
-          .map(
-            (e) => ModerationActionConfigResponse.fromJson(
-              e as Map<String, dynamic>,
-            ),
-          )
-          .toList(),
-    ),
-  ),
+  actionConfig:
+      (json['action_config'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          k,
+          (e as List<dynamic>)
+              .map(
+                (e) => ModerationActionConfigResponse.fromJson(
+                  e as Map<String, dynamic>,
+                ),
+              )
+              .toList(),
+        ),
+      ) ??
+      {},
   defaultActionConfig: (json['default_action_config'] as Map<String, dynamic>?)?.map(
     (k, e) => MapEntry(
       k,
@@ -39,12 +41,16 @@ QueryReviewQueueResponse _$QueryReviewQueueResponseFromJson(
       : FilterConfigResponse.fromJson(
           json['filter_config'] as Map<String, dynamic>,
         ),
-  items: (json['items'] as List<dynamic>)
-      .map((e) => ReviewQueueItemResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  items:
+      (json['items'] as List<dynamic>?)
+          ?.map(
+            (e) => ReviewQueueItemResponse.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
   next: json['next'] as String?,
   prev: json['prev'] as String?,
-  stats: json['stats'] as Map<String, dynamic>,
+  stats: json['stats'] as Map<String, dynamic>? ?? {},
 );
 
 Map<String, dynamic> _$QueryReviewQueueResponseToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_users_payload.dart b/packages/stream_feeds/lib/src/generated/api/model/query_users_payload.dart
index c2aac9cd..04fa04a0 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_users_payload.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_users_payload.dart
@@ -27,6 +27,7 @@ class QueryUsersPayload with _$QueryUsersPayload {
   });
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> filterConditions;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_users_payload.g.dart b/packages/stream_feeds/lib/src/generated/api/model/query_users_payload.g.dart
index c79a9f41..a1b31dff 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_users_payload.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_users_payload.g.dart
@@ -7,7 +7,7 @@ part of 'query_users_payload.dart';
 // **************************************************************************
 
 QueryUsersPayload _$QueryUsersPayloadFromJson(Map<String, dynamic> json) => QueryUsersPayload(
-  filterConditions: json['filter_conditions'] as Map<String, dynamic>,
+  filterConditions: json['filter_conditions'] as Map<String, dynamic>? ?? {},
   includeDeactivatedUsers: json['include_deactivated_users'] as bool?,
   limit: (json['limit'] as num?)?.toInt(),
   offset: (json['offset'] as num?)?.toInt(),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_users_response.dart b/packages/stream_feeds/lib/src/generated/api/model/query_users_response.dart
index add4552d..aaf85459 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_users_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_users_response.dart
@@ -26,6 +26,7 @@ class QueryUsersResponse with _$QueryUsersResponse {
   final String duration;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FullUserResponse> users;
 
   Map<String, dynamic> toJson() => _$QueryUsersResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/query_users_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/query_users_response.g.dart
index 5d2fb4f5..eb8f3b1c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/query_users_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/query_users_response.g.dart
@@ -8,7 +8,9 @@ part of 'query_users_response.dart';
 
 QueryUsersResponse _$QueryUsersResponseFromJson(Map<String, dynamic> json) => QueryUsersResponse(
   duration: json['duration'] as String,
-  users: (json['users'] as List<dynamic>).map((e) => FullUserResponse.fromJson(e as Map<String, dynamic>)).toList(),
+  users:
+      (json['users'] as List<dynamic>?)?.map((e) => FullUserResponse.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
 );
 
 Map<String, dynamic> _$QueryUsersResponseToJson(QueryUsersResponse instance) => <String, dynamic>{
diff --git a/packages/stream_feeds/lib/src/generated/api/model/reaction.g.dart b/packages/stream_feeds/lib/src/generated/api/model/reaction.g.dart
index abe4dd4f..9711e7ff 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/reaction.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/reaction.g.dart
@@ -10,10 +10,10 @@ Reaction _$ReactionFromJson(Map<String, dynamic> json) => Reaction(
   activityId: json['activity_id'] as String,
   childrenCounts: json['children_counts'] as Map<String, dynamic>?,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   data: json['data'] as Map<String, dynamic>?,
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -37,7 +37,7 @@ Reaction _$ReactionFromJson(Map<String, dynamic> json) => Reaction(
   targetFeeds: (json['target_feeds'] as List<dynamic>?)?.map((e) => e as String).toList(),
   targetFeedsExtraData: json['target_feeds_extra_data'] as Map<String, dynamic>?,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: json['user'] == null ? null : User.fromJson(json['user'] as Map<String, dynamic>),
   userId: json['user_id'] as String,
@@ -48,7 +48,7 @@ Map<String, dynamic> _$ReactionToJson(Reaction instance) => <String, dynamic>{
   'children_counts': instance.childrenCounts,
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'data': instance.data,
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/reaction_group_response.dart b/packages/stream_feeds/lib/src/generated/api/model/reaction_group_response.dart
index 32622ba8..1d886305 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/reaction_group_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/reaction_group_response.dart
@@ -36,6 +36,7 @@ class ReactionGroupResponse with _$ReactionGroupResponse {
   final DateTime lastReactionAt;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ReactionGroupUserResponse> latestReactionsBy;
 
   Map<String, dynamic> toJson() => _$ReactionGroupResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/reaction_group_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/reaction_group_response.g.dart
index 4a59d15c..8903bbce 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/reaction_group_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/reaction_group_response.g.dart
@@ -11,14 +11,18 @@ ReactionGroupResponse _$ReactionGroupResponseFromJson(
 ) => ReactionGroupResponse(
   count: (json['count'] as num).toInt(),
   firstReactionAt: const EpochDateTimeConverter().fromJson(
-    (json['first_reaction_at'] as num).toInt(),
+    json['first_reaction_at'] as Object,
   ),
   lastReactionAt: const EpochDateTimeConverter().fromJson(
-    (json['last_reaction_at'] as num).toInt(),
+    json['last_reaction_at'] as Object,
   ),
-  latestReactionsBy: (json['latest_reactions_by'] as List<dynamic>)
-      .map((e) => ReactionGroupUserResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  latestReactionsBy:
+      (json['latest_reactions_by'] as List<dynamic>?)
+          ?.map(
+            (e) => ReactionGroupUserResponse.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$ReactionGroupResponseToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/reaction_group_user_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/reaction_group_user_response.g.dart
index aae6bd57..b61d622c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/reaction_group_user_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/reaction_group_user_response.g.dart
@@ -10,7 +10,7 @@ ReactionGroupUserResponse _$ReactionGroupUserResponseFromJson(
   Map<String, dynamic> json,
 ) => ReactionGroupUserResponse(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   user: json['user'] == null ? null : UserResponse.fromJson(json['user'] as Map<String, dynamic>),
   userId: json['user_id'] as String,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/reaction_response.dart b/packages/stream_feeds/lib/src/generated/api/model/reaction_response.dart
index 815fbf60..4d958d02 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/reaction_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/reaction_response.dart
@@ -33,6 +33,7 @@ class ReactionResponse with _$ReactionResponse {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/reaction_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/reaction_response.g.dart
index 3a68ddbd..b0798ac8 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/reaction_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/reaction_response.g.dart
@@ -8,14 +8,14 @@ part of 'reaction_response.dart';
 
 ReactionResponse _$ReactionResponseFromJson(Map<String, dynamic> json) => ReactionResponse(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   messageId: json['message_id'] as String,
   score: (json['score'] as num).toInt(),
   type: json['type'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: UserResponse.fromJson(json['user'] as Map<String, dynamic>),
   userId: json['user_id'] as String,
diff --git a/packages/stream_feeds/lib/src/generated/api/model/read_collections_response.dart b/packages/stream_feeds/lib/src/generated/api/model/read_collections_response.dart
index 45ee4e0c..cc19d1db 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/read_collections_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/read_collections_response.dart
@@ -23,6 +23,7 @@ class ReadCollectionsResponse with _$ReadCollectionsResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<CollectionResponse> collections;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/read_collections_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/read_collections_response.g.dart
index dcd84729..2a00a924 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/read_collections_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/read_collections_response.g.dart
@@ -9,9 +9,11 @@ part of 'read_collections_response.dart';
 ReadCollectionsResponse _$ReadCollectionsResponseFromJson(
   Map<String, dynamic> json,
 ) => ReadCollectionsResponse(
-  collections: (json['collections'] as List<dynamic>)
-      .map((e) => CollectionResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  collections:
+      (json['collections'] as List<dynamic>?)
+          ?.map((e) => CollectionResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   duration: json['duration'] as String,
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/reminder_response_data.g.dart b/packages/stream_feeds/lib/src/generated/api/model/reminder_response_data.g.dart
index e9f16bec..86690e37 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/reminder_response_data.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/reminder_response_data.g.dart
@@ -12,16 +12,16 @@ ReminderResponseData _$ReminderResponseDataFromJson(
   channel: json['channel'] == null ? null : ChannelResponse.fromJson(json['channel'] as Map<String, dynamic>),
   channelCid: json['channel_cid'] as String,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   message: json['message'] == null ? null : MessageResponse.fromJson(json['message'] as Map<String, dynamic>),
   messageId: json['message_id'] as String,
-  remindAt: _$JsonConverterFromJson<int, DateTime>(
+  remindAt: _$JsonConverterFromJson<Object, DateTime>(
     json['remind_at'],
     const EpochDateTimeConverter().fromJson,
   ),
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: json['user'] == null ? null : UserResponse.fromJson(json['user'] as Map<String, dynamic>),
   userId: json['user_id'] as String,
@@ -35,7 +35,7 @@ Map<String, dynamic> _$ReminderResponseDataToJson(
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'message': instance.message?.toJson(),
   'message_id': instance.messageId,
-  'remind_at': _$JsonConverterToJson<int, DateTime>(
+  'remind_at': _$JsonConverterToJson<Object, DateTime>(
     instance.remindAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/remove_user_group_members_request.dart b/packages/stream_feeds/lib/src/generated/api/model/remove_user_group_members_request.dart
index 1e29bdcb..9b204b04 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/remove_user_group_members_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/remove_user_group_members_request.dart
@@ -23,6 +23,7 @@ class RemoveUserGroupMembersRequest with _$RemoveUserGroupMembersRequest {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> memberIds;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/remove_user_group_members_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/remove_user_group_members_request.g.dart
index 872fcfab..57c57502 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/remove_user_group_members_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/remove_user_group_members_request.g.dart
@@ -9,7 +9,7 @@ part of 'remove_user_group_members_request.dart';
 RemoveUserGroupMembersRequest _$RemoveUserGroupMembersRequestFromJson(
   Map<String, dynamic> json,
 ) => RemoveUserGroupMembersRequest(
-  memberIds: (json['member_ids'] as List<dynamic>).map((e) => e as String).toList(),
+  memberIds: (json['member_ids'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   teamId: json['team_id'] as String?,
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/review_queue_item_response.dart b/packages/stream_feeds/lib/src/generated/api/model/review_queue_item_response.dart
index 6a5420ed..21aa752c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/review_queue_item_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/review_queue_item_response.dart
@@ -58,6 +58,7 @@ class ReviewQueueItemResponse with _$ReviewQueueItemResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ActionLogResponse> actions;
 
   @override
@@ -73,6 +74,7 @@ class ReviewQueueItemResponse with _$ReviewQueueItemResponse {
   final UserResponse? assignedTo;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<BanInfoResponse> bans;
 
   @override
@@ -127,6 +129,7 @@ class ReviewQueueItemResponse with _$ReviewQueueItemResponse {
   final FeedsV3CommentResponse? feedsV3Comment;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ModerationFlagResponse> flags;
 
   @override
@@ -136,6 +139,7 @@ class ReviewQueueItemResponse with _$ReviewQueueItemResponse {
   final String id;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> languages;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/review_queue_item_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/review_queue_item_response.g.dart
index 9b9e6ace..26402420 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/review_queue_item_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/review_queue_item_response.g.dart
@@ -9,22 +9,23 @@ part of 'review_queue_item_response.dart';
 ReviewQueueItemResponse _$ReviewQueueItemResponseFromJson(
   Map<String, dynamic> json,
 ) => ReviewQueueItemResponse(
-  actions: (json['actions'] as List<dynamic>)
-      .map((e) => ActionLogResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  actions:
+      (json['actions'] as List<dynamic>?)?.map((e) => ActionLogResponse.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   activity: json['activity'] == null ? null : EnrichedActivity.fromJson(json['activity'] as Map<String, dynamic>),
   aiTextSeverity: json['ai_text_severity'] as String,
   appeal: json['appeal'] == null ? null : AppealItemResponse.fromJson(json['appeal'] as Map<String, dynamic>),
   assignedTo: json['assigned_to'] == null ? null : UserResponse.fromJson(json['assigned_to'] as Map<String, dynamic>),
-  bans: (json['bans'] as List<dynamic>).map((e) => BanInfoResponse.fromJson(e as Map<String, dynamic>)).toList(),
+  bans:
+      (json['bans'] as List<dynamic>?)?.map((e) => BanInfoResponse.fromJson(e as Map<String, dynamic>)).toList() ?? [],
   call: json['call'] == null ? null : CallResponse.fromJson(json['call'] as Map<String, dynamic>),
-  completedAt: _$JsonConverterFromJson<int, DateTime>(
+  completedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['completed_at'],
     const EpochDateTimeConverter().fromJson,
   ),
   configKey: json['config_key'] as String?,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   entityCreator: json['entity_creator'] == null
       ? null
@@ -35,7 +36,7 @@ ReviewQueueItemResponse _$ReviewQueueItemResponseFromJson(
   entityId: json['entity_id'] as String,
   entityType: json['entity_type'] as String,
   escalated: json['escalated'] as bool,
-  escalatedAt: _$JsonConverterFromJson<int, DateTime>(
+  escalatedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['escalated_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -63,12 +64,16 @@ ReviewQueueItemResponse _$ReviewQueueItemResponseFromJson(
       : FeedsV3CommentResponse.fromJson(
           json['feeds_v3_comment'] as Map<String, dynamic>,
         ),
-  flags: (json['flags'] as List<dynamic>)
-      .map((e) => ModerationFlagResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  flags:
+      (json['flags'] as List<dynamic>?)
+          ?.map(
+            (e) => ModerationFlagResponse.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
   flagsCount: (json['flags_count'] as num).toInt(),
   id: json['id'] as String,
-  languages: (json['languages'] as List<dynamic>).map((e) => e as String).toList(),
+  languages: (json['languages'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   latestModeratorAction: json['latest_moderator_action'] as String,
   message: json['message'] == null ? null : ChatMessageResponse.fromJson(json['message'] as Map<String, dynamic>),
   moderationPayload: json['moderation_payload'] == null
@@ -78,7 +83,7 @@ ReviewQueueItemResponse _$ReviewQueueItemResponseFromJson(
         ),
   reaction: json['reaction'] == null ? null : Reaction.fromJson(json['reaction'] as Map<String, dynamic>),
   recommendedAction: json['recommended_action'] as String,
-  reviewedAt: _$JsonConverterFromJson<int, DateTime>(
+  reviewedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['reviewed_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -87,7 +92,7 @@ ReviewQueueItemResponse _$ReviewQueueItemResponseFromJson(
   status: json['status'] as String,
   teams: (json['teams'] as List<dynamic>?)?.map((e) => e as String).toList(),
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
 );
 
@@ -101,7 +106,7 @@ Map<String, dynamic> _$ReviewQueueItemResponseToJson(
   'assigned_to': instance.assignedTo?.toJson(),
   'bans': instance.bans.map((e) => e.toJson()).toList(),
   'call': instance.call?.toJson(),
-  'completed_at': _$JsonConverterToJson<int, DateTime>(
+  'completed_at': _$JsonConverterToJson<Object, DateTime>(
     instance.completedAt,
     const EpochDateTimeConverter().toJson,
   ),
@@ -112,7 +117,7 @@ Map<String, dynamic> _$ReviewQueueItemResponseToJson(
   'entity_id': instance.entityId,
   'entity_type': instance.entityType,
   'escalated': instance.escalated,
-  'escalated_at': _$JsonConverterToJson<int, DateTime>(
+  'escalated_at': _$JsonConverterToJson<Object, DateTime>(
     instance.escalatedAt,
     const EpochDateTimeConverter().toJson,
   ),
@@ -131,7 +136,7 @@ Map<String, dynamic> _$ReviewQueueItemResponseToJson(
   'moderation_payload': instance.moderationPayload?.toJson(),
   'reaction': instance.reaction?.toJson(),
   'recommended_action': instance.recommendedAction,
-  'reviewed_at': _$JsonConverterToJson<int, DateTime>(
+  'reviewed_at': _$JsonConverterToJson<Object, DateTime>(
     instance.reviewedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/role.dart b/packages/stream_feeds/lib/src/generated/api/model/role.dart
index 3a048325..1df2c0a4 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/role.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/role.dart
@@ -36,6 +36,7 @@ class Role with _$Role {
   final String name;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> scopes;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/role.g.dart b/packages/stream_feeds/lib/src/generated/api/model/role.g.dart
index 7cbfd907..a8f2ec9f 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/role.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/role.g.dart
@@ -8,13 +8,13 @@ part of 'role.dart';
 
 Role _$RoleFromJson(Map<String, dynamic> json) => Role(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   custom: json['custom'] as bool,
   name: json['name'] as String,
-  scopes: (json['scopes'] as List<dynamic>).map((e) => e as String).toList(),
+  scopes: (json['scopes'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/search_roles_response.dart b/packages/stream_feeds/lib/src/generated/api/model/search_roles_response.dart
index 367001f1..256c77ef 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/search_roles_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/search_roles_response.dart
@@ -26,6 +26,7 @@ class SearchRolesResponse with _$SearchRolesResponse {
   final String duration;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<Role> roles;
 
   Map<String, dynamic> toJson() => _$SearchRolesResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/search_roles_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/search_roles_response.g.dart
index 4c167b82..432ba1c7 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/search_roles_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/search_roles_response.g.dart
@@ -8,7 +8,7 @@ part of 'search_roles_response.dart';
 
 SearchRolesResponse _$SearchRolesResponseFromJson(Map<String, dynamic> json) => SearchRolesResponse(
   duration: json['duration'] as String,
-  roles: (json['roles'] as List<dynamic>).map((e) => Role.fromJson(e as Map<String, dynamic>)).toList(),
+  roles: (json['roles'] as List<dynamic>?)?.map((e) => Role.fromJson(e as Map<String, dynamic>)).toList() ?? [],
 );
 
 Map<String, dynamic> _$SearchRolesResponseToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/search_user_groups_response.dart b/packages/stream_feeds/lib/src/generated/api/model/search_user_groups_response.dart
index 1d8a3a8e..9a4d38e1 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/search_user_groups_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/search_user_groups_response.dart
@@ -26,6 +26,7 @@ class SearchUserGroupsResponse with _$SearchUserGroupsResponse {
   final String duration;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<UserGroupResponse> userGroups;
 
   Map<String, dynamic> toJson() => _$SearchUserGroupsResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/search_user_groups_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/search_user_groups_response.g.dart
index b4b81d89..8bbe2cfe 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/search_user_groups_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/search_user_groups_response.g.dart
@@ -10,9 +10,11 @@ SearchUserGroupsResponse _$SearchUserGroupsResponseFromJson(
   Map<String, dynamic> json,
 ) => SearchUserGroupsResponse(
   duration: json['duration'] as String,
-  userGroups: (json['user_groups'] as List<dynamic>)
-      .map((e) => UserGroupResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  userGroups:
+      (json['user_groups'] as List<dynamic>?)
+          ?.map((e) => UserGroupResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$SearchUserGroupsResponseToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/shared_location_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/shared_location_response.g.dart
index 4792922c..5da91e18 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/shared_location_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/shared_location_response.g.dart
@@ -12,11 +12,11 @@ SharedLocationResponse _$SharedLocationResponseFromJson(
   channel: json['channel'] == null ? null : ChannelResponse.fromJson(json['channel'] as Map<String, dynamic>),
   channelCid: json['channel_cid'] as String,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   createdByDeviceId: json['created_by_device_id'] as String,
   duration: json['duration'] as String,
-  endAt: _$JsonConverterFromJson<int, DateTime>(
+  endAt: _$JsonConverterFromJson<Object, DateTime>(
     json['end_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -25,7 +25,7 @@ SharedLocationResponse _$SharedLocationResponseFromJson(
   message: json['message'] == null ? null : MessageResponse.fromJson(json['message'] as Map<String, dynamic>),
   messageId: json['message_id'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   userId: json['user_id'] as String,
 );
@@ -38,7 +38,7 @@ Map<String, dynamic> _$SharedLocationResponseToJson(
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'created_by_device_id': instance.createdByDeviceId,
   'duration': instance.duration,
-  'end_at': _$JsonConverterToJson<int, DateTime>(
+  'end_at': _$JsonConverterToJson<Object, DateTime>(
     instance.endAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/shared_location_response_data.g.dart b/packages/stream_feeds/lib/src/generated/api/model/shared_location_response_data.g.dart
index 32ab826a..5e01dd13 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/shared_location_response_data.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/shared_location_response_data.g.dart
@@ -12,10 +12,10 @@ SharedLocationResponseData _$SharedLocationResponseDataFromJson(
   channel: json['channel'] == null ? null : ChannelResponse.fromJson(json['channel'] as Map<String, dynamic>),
   channelCid: json['channel_cid'] as String,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   createdByDeviceId: json['created_by_device_id'] as String,
-  endAt: _$JsonConverterFromJson<int, DateTime>(
+  endAt: _$JsonConverterFromJson<Object, DateTime>(
     json['end_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -24,7 +24,7 @@ SharedLocationResponseData _$SharedLocationResponseDataFromJson(
   message: json['message'] == null ? null : MessageResponse.fromJson(json['message'] as Map<String, dynamic>),
   messageId: json['message_id'] as String,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   userId: json['user_id'] as String,
 );
@@ -36,7 +36,7 @@ Map<String, dynamic> _$SharedLocationResponseDataToJson(
   'channel_cid': instance.channelCid,
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'created_by_device_id': instance.createdByDeviceId,
-  'end_at': _$JsonConverterToJson<int, DateTime>(
+  'end_at': _$JsonConverterToJson<Object, DateTime>(
     instance.endAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/shared_locations_response.dart b/packages/stream_feeds/lib/src/generated/api/model/shared_locations_response.dart
index 0cc9613d..1056696b 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/shared_locations_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/shared_locations_response.dart
@@ -23,6 +23,7 @@ class SharedLocationsResponse with _$SharedLocationsResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<SharedLocationResponseData> activeLiveLocations;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/shared_locations_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/shared_locations_response.g.dart
index 503e4916..1aba2330 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/shared_locations_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/shared_locations_response.g.dart
@@ -9,11 +9,13 @@ part of 'shared_locations_response.dart';
 SharedLocationsResponse _$SharedLocationsResponseFromJson(
   Map<String, dynamic> json,
 ) => SharedLocationsResponse(
-  activeLiveLocations: (json['active_live_locations'] as List<dynamic>)
-      .map(
-        (e) => SharedLocationResponseData.fromJson(e as Map<String, dynamic>),
-      )
-      .toList(),
+  activeLiveLocations:
+      (json['active_live_locations'] as List<dynamic>?)
+          ?.map(
+            (e) => SharedLocationResponseData.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
   duration: json['duration'] as String,
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/stories_feed_updated_event.dart b/packages/stream_feeds/lib/src/generated/api/model/stories_feed_updated_event.dart
index adca9cd7..7b0f600e 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/stories_feed_updated_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/stories_feed_updated_event.dart
@@ -40,6 +40,7 @@ class StoriesFeedUpdatedEvent extends core.WsEvent with _$StoriesFeedUpdatedEven
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/stories_feed_updated_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/stories_feed_updated_event.g.dart
index aea1fde0..74158346 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/stories_feed_updated_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/stories_feed_updated_event.g.dart
@@ -18,12 +18,12 @@ StoriesFeedUpdatedEvent _$StoriesFeedUpdatedEventFromJson(
       )
       .toList(),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   feedVisibility: json['feed_visibility'] as String?,
   fid: json['fid'] as String,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -40,7 +40,7 @@ Map<String, dynamic> _$StoriesFeedUpdatedEventToJson(
   'custom': instance.custom,
   'feed_visibility': instance.feedVisibility,
   'fid': instance.fid,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/threaded_comment_response.dart b/packages/stream_feeds/lib/src/generated/api/model/threaded_comment_response.dart
index 91efe5d0..8010c0a8 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/threaded_comment_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/threaded_comment_response.dart
@@ -101,6 +101,7 @@ class ThreadedCommentResponse with _$ThreadedCommentResponse {
   final List<FeedsReactionResponse>? latestReactions;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<UserResponse> mentionedUsers;
 
   @override
@@ -116,6 +117,7 @@ class ThreadedCommentResponse with _$ThreadedCommentResponse {
   final String objectType;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedsReactionResponse> ownReactions;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/threaded_comment_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/threaded_comment_response.g.dart
index 8b66af8a..879796a6 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/threaded_comment_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/threaded_comment_response.g.dart
@@ -16,15 +16,15 @@ ThreadedCommentResponse _$ThreadedCommentResponseFromJson(
   confidenceScore: (json['confidence_score'] as num).toDouble(),
   controversyScore: (json['controversy_score'] as num?)?.toDouble(),
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   custom: json['custom'] as Map<String, dynamic>?,
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
   downvoteCount: (json['downvote_count'] as num).toInt(),
-  editedAt: _$JsonConverterFromJson<int, DateTime>(
+  editedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['edited_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -32,9 +32,11 @@ ThreadedCommentResponse _$ThreadedCommentResponseFromJson(
   latestReactions: (json['latest_reactions'] as List<dynamic>?)
       ?.map((e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>))
       .toList(),
-  mentionedUsers: (json['mentioned_users'] as List<dynamic>)
-      .map((e) => UserResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  mentionedUsers:
+      (json['mentioned_users'] as List<dynamic>?)
+          ?.map((e) => UserResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   meta: json['meta'] == null ? null : RepliesMeta.fromJson(json['meta'] as Map<String, dynamic>),
   moderation: json['moderation'] == null
       ? null
@@ -43,9 +45,13 @@ ThreadedCommentResponse _$ThreadedCommentResponseFromJson(
         ),
   objectId: json['object_id'] as String,
   objectType: json['object_type'] as String,
-  ownReactions: (json['own_reactions'] as List<dynamic>)
-      .map((e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  ownReactions:
+      (json['own_reactions'] as List<dynamic>?)
+          ?.map(
+            (e) => FeedsReactionResponse.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
   parentId: json['parent_id'] as String?,
   reactionCount: (json['reaction_count'] as num).toInt(),
   reactionGroups: (json['reaction_groups'] as Map<String, dynamic>?)?.map(
@@ -66,7 +72,7 @@ ThreadedCommentResponse _$ThreadedCommentResponseFromJson(
   ),
   text: json['text'] as String?,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   upvoteCount: (json['upvote_count'] as num).toInt(),
   user: UserResponse.fromJson(json['user'] as Map<String, dynamic>),
@@ -81,12 +87,12 @@ Map<String, dynamic> _$ThreadedCommentResponseToJson(
   'controversy_score': instance.controversyScore,
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
   'downvote_count': instance.downvoteCount,
-  'edited_at': _$JsonConverterToJson<int, DateTime>(
+  'edited_at': _$JsonConverterToJson<Object, DateTime>(
     instance.editedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/track_activity_metrics_request.dart b/packages/stream_feeds/lib/src/generated/api/model/track_activity_metrics_request.dart
index fce7e950..588a623d 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/track_activity_metrics_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/track_activity_metrics_request.dart
@@ -22,6 +22,7 @@ class TrackActivityMetricsRequest with _$TrackActivityMetricsRequest {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<TrackActivityMetricsEvent> events;
 
   Map<String, dynamic> toJson() => _$TrackActivityMetricsRequestToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/track_activity_metrics_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/track_activity_metrics_request.g.dart
index fee5d061..26dab898 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/track_activity_metrics_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/track_activity_metrics_request.g.dart
@@ -9,9 +9,13 @@ part of 'track_activity_metrics_request.dart';
 TrackActivityMetricsRequest _$TrackActivityMetricsRequestFromJson(
   Map<String, dynamic> json,
 ) => TrackActivityMetricsRequest(
-  events: (json['events'] as List<dynamic>)
-      .map((e) => TrackActivityMetricsEvent.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  events:
+      (json['events'] as List<dynamic>?)
+          ?.map(
+            (e) => TrackActivityMetricsEvent.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$TrackActivityMetricsRequestToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/track_activity_metrics_response.dart b/packages/stream_feeds/lib/src/generated/api/model/track_activity_metrics_response.dart
index 6ed349fc..055ba9a4 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/track_activity_metrics_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/track_activity_metrics_response.dart
@@ -26,6 +26,7 @@ class TrackActivityMetricsResponse with _$TrackActivityMetricsResponse {
   final String duration;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<TrackActivityMetricsEventResult> results;
 
   Map<String, dynamic> toJson() => _$TrackActivityMetricsResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/track_activity_metrics_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/track_activity_metrics_response.g.dart
index d218542f..48d86e66 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/track_activity_metrics_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/track_activity_metrics_response.g.dart
@@ -10,11 +10,15 @@ TrackActivityMetricsResponse _$TrackActivityMetricsResponseFromJson(
   Map<String, dynamic> json,
 ) => TrackActivityMetricsResponse(
   duration: json['duration'] as String,
-  results: (json['results'] as List<dynamic>)
-      .map(
-        (e) => TrackActivityMetricsEventResult.fromJson(e as Map<String, dynamic>),
-      )
-      .toList(),
+  results:
+      (json['results'] as List<dynamic>?)
+          ?.map(
+            (e) => TrackActivityMetricsEventResult.fromJson(
+              e as Map<String, dynamic>,
+            ),
+          )
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$TrackActivityMetricsResponseToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/unfollow_batch_request.dart b/packages/stream_feeds/lib/src/generated/api/model/unfollow_batch_request.dart
index e0d4c163..3680793a 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/unfollow_batch_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/unfollow_batch_request.dart
@@ -30,6 +30,7 @@ class UnfollowBatchRequest with _$UnfollowBatchRequest {
   final bool? enrichOwnFields;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<UnfollowPair> follows;
 
   Map<String, dynamic> toJson() => _$UnfollowBatchRequestToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/unfollow_batch_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/unfollow_batch_request.g.dart
index e0b27076..76c36d5f 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/unfollow_batch_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/unfollow_batch_request.g.dart
@@ -11,7 +11,8 @@ UnfollowBatchRequest _$UnfollowBatchRequestFromJson(
 ) => UnfollowBatchRequest(
   deleteNotificationActivity: json['delete_notification_activity'] as bool?,
   enrichOwnFields: json['enrich_own_fields'] as bool?,
-  follows: (json['follows'] as List<dynamic>).map((e) => UnfollowPair.fromJson(e as Map<String, dynamic>)).toList(),
+  follows:
+      (json['follows'] as List<dynamic>?)?.map((e) => UnfollowPair.fromJson(e as Map<String, dynamic>)).toList() ?? [],
 );
 
 Map<String, dynamic> _$UnfollowBatchRequestToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/unfollow_batch_response.dart b/packages/stream_feeds/lib/src/generated/api/model/unfollow_batch_response.dart
index 316c5dc1..35dce198 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/unfollow_batch_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/unfollow_batch_response.dart
@@ -26,6 +26,7 @@ class UnfollowBatchResponse with _$UnfollowBatchResponse {
   final String duration;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FollowResponse> follows;
 
   Map<String, dynamic> toJson() => _$UnfollowBatchResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/unfollow_batch_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/unfollow_batch_response.g.dart
index 34bc07e0..4567d503 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/unfollow_batch_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/unfollow_batch_response.g.dart
@@ -10,7 +10,9 @@ UnfollowBatchResponse _$UnfollowBatchResponseFromJson(
   Map<String, dynamic> json,
 ) => UnfollowBatchResponse(
   duration: json['duration'] as String,
-  follows: (json['follows'] as List<dynamic>).map((e) => FollowResponse.fromJson(e as Map<String, dynamic>)).toList(),
+  follows:
+      (json['follows'] as List<dynamic>?)?.map((e) => FollowResponse.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
 );
 
 Map<String, dynamic> _$UnfollowBatchResponseToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/update_activity_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/update_activity_request.g.dart
index 495fb8b8..4526cb83 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/update_activity_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/update_activity_request.g.dart
@@ -16,7 +16,7 @@ UpdateActivityRequest _$UpdateActivityRequestFromJson(
   copyCustomToNotification: json['copy_custom_to_notification'] as bool?,
   custom: json['custom'] as Map<String, dynamic>?,
   enrichOwnFields: json['enrich_own_fields'] as bool?,
-  expiresAt: _$JsonConverterFromJson<int, DateTime>(
+  expiresAt: _$JsonConverterFromJson<Object, DateTime>(
     json['expires_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -52,7 +52,7 @@ Map<String, dynamic> _$UpdateActivityRequestToJson(
   'copy_custom_to_notification': instance.copyCustomToNotification,
   'custom': instance.custom,
   'enrich_own_fields': instance.enrichOwnFields,
-  'expires_at': _$JsonConverterToJson<int, DateTime>(
+  'expires_at': _$JsonConverterToJson<Object, DateTime>(
     instance.expiresAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/update_collection_request.dart b/packages/stream_feeds/lib/src/generated/api/model/update_collection_request.dart
index bd7557b6..da92fa63 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/update_collection_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/update_collection_request.dart
@@ -24,6 +24,7 @@ class UpdateCollectionRequest with _$UpdateCollectionRequest {
   });
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/update_collection_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/update_collection_request.g.dart
index 15a2a56d..3e9666fd 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/update_collection_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/update_collection_request.g.dart
@@ -9,7 +9,7 @@ part of 'update_collection_request.dart';
 UpdateCollectionRequest _$UpdateCollectionRequestFromJson(
   Map<String, dynamic> json,
 ) => UpdateCollectionRequest(
-  custom: json['custom'] as Map<String, dynamic>,
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
   id: json['id'] as String,
   name: json['name'] as String,
 );
diff --git a/packages/stream_feeds/lib/src/generated/api/model/update_collections_request.dart b/packages/stream_feeds/lib/src/generated/api/model/update_collections_request.dart
index 44c2fdf1..fcc168c4 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/update_collections_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/update_collections_request.dart
@@ -22,6 +22,7 @@ class UpdateCollectionsRequest with _$UpdateCollectionsRequest {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<UpdateCollectionRequest> collections;
 
   Map<String, dynamic> toJson() => _$UpdateCollectionsRequestToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/update_collections_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/update_collections_request.g.dart
index 4f8260e8..6f685bfb 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/update_collections_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/update_collections_request.g.dart
@@ -9,9 +9,13 @@ part of 'update_collections_request.dart';
 UpdateCollectionsRequest _$UpdateCollectionsRequestFromJson(
   Map<String, dynamic> json,
 ) => UpdateCollectionsRequest(
-  collections: (json['collections'] as List<dynamic>)
-      .map((e) => UpdateCollectionRequest.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  collections:
+      (json['collections'] as List<dynamic>?)
+          ?.map(
+            (e) => UpdateCollectionRequest.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$UpdateCollectionsRequestToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/update_collections_response.dart b/packages/stream_feeds/lib/src/generated/api/model/update_collections_response.dart
index 45df3cf9..7c49206b 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/update_collections_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/update_collections_response.dart
@@ -23,6 +23,7 @@ class UpdateCollectionsResponse with _$UpdateCollectionsResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<CollectionResponse> collections;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/update_collections_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/update_collections_response.g.dart
index 1e499646..d7fb31a0 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/update_collections_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/update_collections_response.g.dart
@@ -9,9 +9,11 @@ part of 'update_collections_response.dart';
 UpdateCollectionsResponse _$UpdateCollectionsResponseFromJson(
   Map<String, dynamic> json,
 ) => UpdateCollectionsResponse(
-  collections: (json['collections'] as List<dynamic>)
-      .map((e) => CollectionResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  collections:
+      (json['collections'] as List<dynamic>?)
+          ?.map((e) => CollectionResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   duration: json['duration'] as String,
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/update_feed_members_response.dart b/packages/stream_feeds/lib/src/generated/api/model/update_feed_members_response.dart
index de37c676..5ad57fe5 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/update_feed_members_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/update_feed_members_response.dart
@@ -25,15 +25,18 @@ class UpdateFeedMembersResponse with _$UpdateFeedMembersResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedMemberResponse> added;
 
   @override
   final String duration;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> removedIds;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<FeedMemberResponse> updated;
 
   Map<String, dynamic> toJson() => _$UpdateFeedMembersResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/update_feed_members_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/update_feed_members_response.g.dart
index 5d8277ee..0eb8bb0f 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/update_feed_members_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/update_feed_members_response.g.dart
@@ -9,12 +9,16 @@ part of 'update_feed_members_response.dart';
 UpdateFeedMembersResponse _$UpdateFeedMembersResponseFromJson(
   Map<String, dynamic> json,
 ) => UpdateFeedMembersResponse(
-  added: (json['added'] as List<dynamic>).map((e) => FeedMemberResponse.fromJson(e as Map<String, dynamic>)).toList(),
+  added:
+      (json['added'] as List<dynamic>?)?.map((e) => FeedMemberResponse.fromJson(e as Map<String, dynamic>)).toList() ??
+      [],
   duration: json['duration'] as String,
-  removedIds: (json['removed_ids'] as List<dynamic>).map((e) => e as String).toList(),
-  updated: (json['updated'] as List<dynamic>)
-      .map((e) => FeedMemberResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  removedIds: (json['removed_ids'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
+  updated:
+      (json['updated'] as List<dynamic>?)
+          ?.map((e) => FeedMemberResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$UpdateFeedMembersResponseToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/update_live_location_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/update_live_location_request.g.dart
index 39a49524..30984f86 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/update_live_location_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/update_live_location_request.g.dart
@@ -9,7 +9,7 @@ part of 'update_live_location_request.dart';
 UpdateLiveLocationRequest _$UpdateLiveLocationRequestFromJson(
   Map<String, dynamic> json,
 ) => UpdateLiveLocationRequest(
-  endAt: _$JsonConverterFromJson<int, DateTime>(
+  endAt: _$JsonConverterFromJson<Object, DateTime>(
     json['end_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -21,7 +21,7 @@ UpdateLiveLocationRequest _$UpdateLiveLocationRequestFromJson(
 Map<String, dynamic> _$UpdateLiveLocationRequestToJson(
   UpdateLiveLocationRequest instance,
 ) => <String, dynamic>{
-  'end_at': _$JsonConverterToJson<int, DateTime>(
+  'end_at': _$JsonConverterToJson<Object, DateTime>(
     instance.endAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/update_users_partial_request.dart b/packages/stream_feeds/lib/src/generated/api/model/update_users_partial_request.dart
index d18efced..b351516b 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/update_users_partial_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/update_users_partial_request.dart
@@ -22,6 +22,7 @@ class UpdateUsersPartialRequest with _$UpdateUsersPartialRequest {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<UpdateUserPartialRequest> users;
 
   Map<String, dynamic> toJson() => _$UpdateUsersPartialRequestToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/update_users_partial_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/update_users_partial_request.g.dart
index 36f8ca2b..e1db3748 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/update_users_partial_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/update_users_partial_request.g.dart
@@ -9,9 +9,13 @@ part of 'update_users_partial_request.dart';
 UpdateUsersPartialRequest _$UpdateUsersPartialRequestFromJson(
   Map<String, dynamic> json,
 ) => UpdateUsersPartialRequest(
-  users: (json['users'] as List<dynamic>)
-      .map((e) => UpdateUserPartialRequest.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  users:
+      (json['users'] as List<dynamic>?)
+          ?.map(
+            (e) => UpdateUserPartialRequest.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$UpdateUsersPartialRequestToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/update_users_request.dart b/packages/stream_feeds/lib/src/generated/api/model/update_users_request.dart
index dd185b62..d3906c8c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/update_users_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/update_users_request.dart
@@ -22,6 +22,7 @@ class UpdateUsersRequest with _$UpdateUsersRequest {
   });
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, UserRequest> users;
 
   Map<String, dynamic> toJson() => _$UpdateUsersRequestToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/update_users_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/update_users_request.g.dart
index 3c4300c5..633edd3a 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/update_users_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/update_users_request.g.dart
@@ -7,9 +7,11 @@ part of 'update_users_request.dart';
 // **************************************************************************
 
 UpdateUsersRequest _$UpdateUsersRequestFromJson(Map<String, dynamic> json) => UpdateUsersRequest(
-  users: (json['users'] as Map<String, dynamic>).map(
-    (k, e) => MapEntry(k, UserRequest.fromJson(e as Map<String, dynamic>)),
-  ),
+  users:
+      (json['users'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(k, UserRequest.fromJson(e as Map<String, dynamic>)),
+      ) ??
+      {},
 );
 
 Map<String, dynamic> _$UpdateUsersRequestToJson(UpdateUsersRequest instance) => <String, dynamic>{
diff --git a/packages/stream_feeds/lib/src/generated/api/model/update_users_response.dart b/packages/stream_feeds/lib/src/generated/api/model/update_users_response.dart
index 3675c6f0..c82a1055 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/update_users_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/update_users_response.dart
@@ -30,6 +30,7 @@ class UpdateUsersResponse with _$UpdateUsersResponse {
   final String membershipDeletionTaskId;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, FullUserResponse> users;
 
   Map<String, dynamic> toJson() => _$UpdateUsersResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/update_users_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/update_users_response.g.dart
index 59cdcd30..9988890f 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/update_users_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/update_users_response.g.dart
@@ -9,9 +9,14 @@ part of 'update_users_response.dart';
 UpdateUsersResponse _$UpdateUsersResponseFromJson(Map<String, dynamic> json) => UpdateUsersResponse(
   duration: json['duration'] as String,
   membershipDeletionTaskId: json['membership_deletion_task_id'] as String,
-  users: (json['users'] as Map<String, dynamic>).map(
-    (k, e) => MapEntry(k, FullUserResponse.fromJson(e as Map<String, dynamic>)),
-  ),
+  users:
+      (json['users'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          k,
+          FullUserResponse.fromJson(e as Map<String, dynamic>),
+        ),
+      ) ??
+      {},
 );
 
 Map<String, dynamic> _$UpdateUsersResponseToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/upsert_activities_request.dart b/packages/stream_feeds/lib/src/generated/api/model/upsert_activities_request.dart
index 36a4add6..9458e681 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/upsert_activities_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/upsert_activities_request.dart
@@ -23,6 +23,7 @@ class UpsertActivitiesRequest with _$UpsertActivitiesRequest {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ActivityRequest> activities;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/upsert_activities_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/upsert_activities_request.g.dart
index be08fd97..26ba33c0 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/upsert_activities_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/upsert_activities_request.g.dart
@@ -9,9 +9,11 @@ part of 'upsert_activities_request.dart';
 UpsertActivitiesRequest _$UpsertActivitiesRequestFromJson(
   Map<String, dynamic> json,
 ) => UpsertActivitiesRequest(
-  activities: (json['activities'] as List<dynamic>)
-      .map((e) => ActivityRequest.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  activities:
+      (json['activities'] as List<dynamic>?)
+          ?.map((e) => ActivityRequest.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   enrichOwnFields: json['enrich_own_fields'] as bool?,
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/upsert_activities_response.dart b/packages/stream_feeds/lib/src/generated/api/model/upsert_activities_response.dart
index c5e1d7fa..75d5c417 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/upsert_activities_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/upsert_activities_response.dart
@@ -24,6 +24,7 @@ class UpsertActivitiesResponse with _$UpsertActivitiesResponse {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<ActivityResponse> activities;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/upsert_activities_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/upsert_activities_response.g.dart
index 491fb403..b8faf169 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/upsert_activities_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/upsert_activities_response.g.dart
@@ -9,9 +9,11 @@ part of 'upsert_activities_response.dart';
 UpsertActivitiesResponse _$UpsertActivitiesResponseFromJson(
   Map<String, dynamic> json,
 ) => UpsertActivitiesResponse(
-  activities: (json['activities'] as List<dynamic>)
-      .map((e) => ActivityResponse.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  activities:
+      (json['activities'] as List<dynamic>?)
+          ?.map((e) => ActivityResponse.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
   duration: json['duration'] as String,
   mentionNotificationsCreated: (json['mention_notifications_created'] as num?)?.toInt(),
 );
diff --git a/packages/stream_feeds/lib/src/generated/api/model/upsert_push_preferences_request.dart b/packages/stream_feeds/lib/src/generated/api/model/upsert_push_preferences_request.dart
index 1eae5298..7292a3a6 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/upsert_push_preferences_request.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/upsert_push_preferences_request.dart
@@ -22,6 +22,7 @@ class UpsertPushPreferencesRequest with _$UpsertPushPreferencesRequest {
   });
 
   @override
+  @JsonKey(defaultValue: [])
   final List<PushPreferenceInput> preferences;
 
   Map<String, dynamic> toJson() => _$UpsertPushPreferencesRequestToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/upsert_push_preferences_request.g.dart b/packages/stream_feeds/lib/src/generated/api/model/upsert_push_preferences_request.g.dart
index a7dfeafb..436c9c9e 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/upsert_push_preferences_request.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/upsert_push_preferences_request.g.dart
@@ -9,9 +9,11 @@ part of 'upsert_push_preferences_request.dart';
 UpsertPushPreferencesRequest _$UpsertPushPreferencesRequestFromJson(
   Map<String, dynamic> json,
 ) => UpsertPushPreferencesRequest(
-  preferences: (json['preferences'] as List<dynamic>)
-      .map((e) => PushPreferenceInput.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  preferences:
+      (json['preferences'] as List<dynamic>?)
+          ?.map((e) => PushPreferenceInput.fromJson(e as Map<String, dynamic>))
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$UpsertPushPreferencesRequestToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/upsert_push_preferences_response.dart b/packages/stream_feeds/lib/src/generated/api/model/upsert_push_preferences_response.dart
index ec71bb7c..b1e9909c 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/upsert_push_preferences_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/upsert_push_preferences_response.dart
@@ -27,9 +27,11 @@ class UpsertPushPreferencesResponse with _$UpsertPushPreferencesResponse {
   final String duration;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Map<String, ChannelPushPreferencesResponse>> userChannelPreferences;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, PushPreferencesResponse> userPreferences;
 
   Map<String, dynamic> toJson() => _$UpsertPushPreferencesResponseToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/upsert_push_preferences_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/upsert_push_preferences_response.g.dart
index dd176047..bd886839 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/upsert_push_preferences_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/upsert_push_preferences_response.g.dart
@@ -10,25 +10,29 @@ UpsertPushPreferencesResponse _$UpsertPushPreferencesResponseFromJson(
   Map<String, dynamic> json,
 ) => UpsertPushPreferencesResponse(
   duration: json['duration'] as String,
-  userChannelPreferences: (json['user_channel_preferences'] as Map<String, dynamic>).map(
-    (k, e) => MapEntry(
-      k,
-      (e as Map<String, dynamic>).map(
+  userChannelPreferences:
+      (json['user_channel_preferences'] as Map<String, dynamic>?)?.map(
         (k, e) => MapEntry(
           k,
-          ChannelPushPreferencesResponse.fromJson(
-            e as Map<String, dynamic>,
+          (e as Map<String, dynamic>).map(
+            (k, e) => MapEntry(
+              k,
+              ChannelPushPreferencesResponse.fromJson(
+                e as Map<String, dynamic>,
+              ),
+            ),
           ),
         ),
-      ),
-    ),
-  ),
-  userPreferences: (json['user_preferences'] as Map<String, dynamic>).map(
-    (k, e) => MapEntry(
-      k,
-      PushPreferencesResponse.fromJson(e as Map<String, dynamic>),
-    ),
-  ),
+      ) ??
+      {},
+  userPreferences:
+      (json['user_preferences'] as Map<String, dynamic>?)?.map(
+        (k, e) => MapEntry(
+          k,
+          PushPreferencesResponse.fromJson(e as Map<String, dynamic>),
+        ),
+      ) ??
+      {},
 );
 
 Map<String, dynamic> _$UpsertPushPreferencesResponseToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/user_banned_event.dart b/packages/stream_feeds/lib/src/generated/api/model/user_banned_event.dart
index 3b662afd..ccaf88be 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/user_banned_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/user_banned_event.dart
@@ -64,6 +64,7 @@ class UserBannedEvent extends core.WsEvent with _$UserBannedEvent {
   final UserResponseCommonFields? createdBy;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/user_banned_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/user_banned_event.g.dart
index a43de196..83f9523f 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/user_banned_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/user_banned_event.g.dart
@@ -14,20 +14,20 @@ UserBannedEvent _$UserBannedEventFromJson(Map<String, dynamic> json) => UserBann
   channelType: json['channel_type'] as String?,
   cid: json['cid'] as String?,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   createdBy: json['created_by'] == null
       ? null
       : UserResponseCommonFields.fromJson(
           json['created_by'] as Map<String, dynamic>,
         ),
-  custom: json['custom'] as Map<String, dynamic>,
-  expiration: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  expiration: _$JsonConverterFromJson<Object, DateTime>(
     json['expiration'],
     const EpochDateTimeConverter().fromJson,
   ),
   reason: json['reason'] as String?,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -51,12 +51,12 @@ Map<String, dynamic> _$UserBannedEventToJson(UserBannedEvent instance) => <Strin
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'created_by': instance.createdBy?.toJson(),
   'custom': instance.custom,
-  'expiration': _$JsonConverterToJson<int, DateTime>(
+  'expiration': _$JsonConverterToJson<Object, DateTime>(
     instance.expiration,
     const EpochDateTimeConverter().toJson,
   ),
   'reason': instance.reason,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/user_deactivated_event.dart b/packages/stream_feeds/lib/src/generated/api/model/user_deactivated_event.dart
index da403314..182eb18a 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/user_deactivated_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/user_deactivated_event.dart
@@ -34,6 +34,7 @@ class UserDeactivatedEvent extends core.WsEvent with _$UserDeactivatedEvent {
   final UserResponseCommonFields? createdBy;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/user_deactivated_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/user_deactivated_event.g.dart
index f37372a3..12c60bf9 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/user_deactivated_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/user_deactivated_event.g.dart
@@ -10,15 +10,15 @@ UserDeactivatedEvent _$UserDeactivatedEventFromJson(
   Map<String, dynamic> json,
 ) => UserDeactivatedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   createdBy: json['created_by'] == null
       ? null
       : UserResponseCommonFields.fromJson(
           json['created_by'] as Map<String, dynamic>,
         ),
-  custom: json['custom'] as Map<String, dynamic>,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -32,7 +32,7 @@ Map<String, dynamic> _$UserDeactivatedEventToJson(
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'created_by': instance.createdBy?.toJson(),
   'custom': instance.custom,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/user_group_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/user_group_response.g.dart
index 1f6c83f9..b2782596 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/user_group_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/user_group_response.g.dart
@@ -8,7 +8,7 @@ part of 'user_group_response.dart';
 
 UserGroupResponse _$UserGroupResponseFromJson(Map<String, dynamic> json) => UserGroupResponse(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   createdBy: json['created_by'] as String?,
   description: json['description'] as String?,
@@ -16,7 +16,7 @@ UserGroupResponse _$UserGroupResponseFromJson(Map<String, dynamic> json) => User
   name: json['name'] as String,
   teamId: json['team_id'] as String?,
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
 );
 
diff --git a/packages/stream_feeds/lib/src/generated/api/model/user_mute_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/user_mute_response.g.dart
index f8bd6dc2..d728ad83 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/user_mute_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/user_mute_response.g.dart
@@ -8,22 +8,22 @@ part of 'user_mute_response.dart';
 
 UserMuteResponse _$UserMuteResponseFromJson(Map<String, dynamic> json) => UserMuteResponse(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  expires: _$JsonConverterFromJson<int, DateTime>(
+  expires: _$JsonConverterFromJson<Object, DateTime>(
     json['expires'],
     const EpochDateTimeConverter().fromJson,
   ),
   target: json['target'] == null ? null : UserResponse.fromJson(json['target'] as Map<String, dynamic>),
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
   user: json['user'] == null ? null : UserResponse.fromJson(json['user'] as Map<String, dynamic>),
 );
 
 Map<String, dynamic> _$UserMuteResponseToJson(UserMuteResponse instance) => <String, dynamic>{
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
-  'expires': _$JsonConverterToJson<int, DateTime>(
+  'expires': _$JsonConverterToJson<Object, DateTime>(
     instance.expires,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/user_reactivated_event.dart b/packages/stream_feeds/lib/src/generated/api/model/user_reactivated_event.dart
index 9c8c61e2..4ddfc6a5 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/user_reactivated_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/user_reactivated_event.dart
@@ -34,6 +34,7 @@ class UserReactivatedEvent extends core.WsEvent with _$UserReactivatedEvent {
   final UserResponseCommonFields? createdBy;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/user_reactivated_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/user_reactivated_event.g.dart
index 1705857c..54f98571 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/user_reactivated_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/user_reactivated_event.g.dart
@@ -10,15 +10,15 @@ UserReactivatedEvent _$UserReactivatedEventFromJson(
   Map<String, dynamic> json,
 ) => UserReactivatedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   createdBy: json['created_by'] == null
       ? null
       : UserResponseCommonFields.fromJson(
           json['created_by'] as Map<String, dynamic>,
         ),
-  custom: json['custom'] as Map<String, dynamic>,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -32,7 +32,7 @@ Map<String, dynamic> _$UserReactivatedEventToJson(
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'created_by': instance.createdBy?.toJson(),
   'custom': instance.custom,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/user_response.dart b/packages/stream_feeds/lib/src/generated/api/model/user_response.dart
index 899c89d0..97084c96 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/user_response.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/user_response.dart
@@ -45,6 +45,7 @@ class UserResponse with _$UserResponse {
   final bool banned;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> blockedUserIds;
 
   @override
@@ -52,6 +53,7 @@ class UserResponse with _$UserResponse {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
@@ -89,6 +91,7 @@ class UserResponse with _$UserResponse {
   final String role;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> teams;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/user_response.g.dart b/packages/stream_feeds/lib/src/generated/api/model/user_response.g.dart
index fef9b437..b31f2f7b 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/user_response.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/user_response.g.dart
@@ -9,39 +9,39 @@ part of 'user_response.dart';
 UserResponse _$UserResponseFromJson(Map<String, dynamic> json) => UserResponse(
   avgResponseTime: (json['avg_response_time'] as num?)?.toInt(),
   banned: json['banned'] as bool,
-  blockedUserIds: (json['blocked_user_ids'] as List<dynamic>).map((e) => e as String).toList(),
+  blockedUserIds: (json['blocked_user_ids'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
-  deactivatedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  deactivatedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deactivated_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
   id: json['id'] as String,
   image: json['image'] as String?,
   language: json['language'] as String,
-  lastActive: _$JsonConverterFromJson<int, DateTime>(
+  lastActive: _$JsonConverterFromJson<Object, DateTime>(
     json['last_active'],
     const EpochDateTimeConverter().fromJson,
   ),
   name: json['name'] as String?,
   online: json['online'] as bool,
-  revokeTokensIssuedBefore: _$JsonConverterFromJson<int, DateTime>(
+  revokeTokensIssuedBefore: _$JsonConverterFromJson<Object, DateTime>(
     json['revoke_tokens_issued_before'],
     const EpochDateTimeConverter().fromJson,
   ),
   role: json['role'] as String,
-  teams: (json['teams'] as List<dynamic>).map((e) => e as String).toList(),
+  teams: (json['teams'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   teamsRole: (json['teams_role'] as Map<String, dynamic>?)?.map(
     (k, e) => MapEntry(k, e as String),
   ),
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
 );
 
@@ -51,24 +51,24 @@ Map<String, dynamic> _$UserResponseToJson(UserResponse instance) => <String, dyn
   'blocked_user_ids': instance.blockedUserIds,
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'deactivated_at': _$JsonConverterToJson<int, DateTime>(
+  'deactivated_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deactivatedAt,
     const EpochDateTimeConverter().toJson,
   ),
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
   'id': instance.id,
   'image': instance.image,
   'language': instance.language,
-  'last_active': _$JsonConverterToJson<int, DateTime>(
+  'last_active': _$JsonConverterToJson<Object, DateTime>(
     instance.lastActive,
     const EpochDateTimeConverter().toJson,
   ),
   'name': instance.name,
   'online': instance.online,
-  'revoke_tokens_issued_before': _$JsonConverterToJson<int, DateTime>(
+  'revoke_tokens_issued_before': _$JsonConverterToJson<Object, DateTime>(
     instance.revokeTokensIssuedBefore,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/user_response_common_fields.dart b/packages/stream_feeds/lib/src/generated/api/model/user_response_common_fields.dart
index 907e6207..715fd09d 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/user_response_common_fields.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/user_response_common_fields.dart
@@ -45,6 +45,7 @@ class UserResponseCommonFields with _$UserResponseCommonFields {
   final bool banned;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> blockedUserIds;
 
   @override
@@ -52,6 +53,7 @@ class UserResponseCommonFields with _$UserResponseCommonFields {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
@@ -89,6 +91,7 @@ class UserResponseCommonFields with _$UserResponseCommonFields {
   final String role;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> teams;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/user_response_common_fields.g.dart b/packages/stream_feeds/lib/src/generated/api/model/user_response_common_fields.g.dart
index 1d9254fa..984225e2 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/user_response_common_fields.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/user_response_common_fields.g.dart
@@ -11,39 +11,39 @@ UserResponseCommonFields _$UserResponseCommonFieldsFromJson(
 ) => UserResponseCommonFields(
   avgResponseTime: (json['avg_response_time'] as num?)?.toInt(),
   banned: json['banned'] as bool,
-  blockedUserIds: (json['blocked_user_ids'] as List<dynamic>).map((e) => e as String).toList(),
+  blockedUserIds: (json['blocked_user_ids'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
-  deactivatedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  deactivatedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deactivated_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
   id: json['id'] as String,
   image: json['image'] as String?,
   language: json['language'] as String,
-  lastActive: _$JsonConverterFromJson<int, DateTime>(
+  lastActive: _$JsonConverterFromJson<Object, DateTime>(
     json['last_active'],
     const EpochDateTimeConverter().fromJson,
   ),
   name: json['name'] as String?,
   online: json['online'] as bool,
-  revokeTokensIssuedBefore: _$JsonConverterFromJson<int, DateTime>(
+  revokeTokensIssuedBefore: _$JsonConverterFromJson<Object, DateTime>(
     json['revoke_tokens_issued_before'],
     const EpochDateTimeConverter().fromJson,
   ),
   role: json['role'] as String,
-  teams: (json['teams'] as List<dynamic>).map((e) => e as String).toList(),
+  teams: (json['teams'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   teamsRole: (json['teams_role'] as Map<String, dynamic>?)?.map(
     (k, e) => MapEntry(k, e as String),
   ),
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
 );
 
@@ -55,24 +55,24 @@ Map<String, dynamic> _$UserResponseCommonFieldsToJson(
   'blocked_user_ids': instance.blockedUserIds,
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'deactivated_at': _$JsonConverterToJson<int, DateTime>(
+  'deactivated_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deactivatedAt,
     const EpochDateTimeConverter().toJson,
   ),
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
   'id': instance.id,
   'image': instance.image,
   'language': instance.language,
-  'last_active': _$JsonConverterToJson<int, DateTime>(
+  'last_active': _$JsonConverterToJson<Object, DateTime>(
     instance.lastActive,
     const EpochDateTimeConverter().toJson,
   ),
   'name': instance.name,
   'online': instance.online,
-  'revoke_tokens_issued_before': _$JsonConverterToJson<int, DateTime>(
+  'revoke_tokens_issued_before': _$JsonConverterToJson<Object, DateTime>(
     instance.revokeTokensIssuedBefore,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/user_response_privacy_fields.dart b/packages/stream_feeds/lib/src/generated/api/model/user_response_privacy_fields.dart
index 58066e45..9f916fb2 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/user_response_privacy_fields.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/user_response_privacy_fields.dart
@@ -47,6 +47,7 @@ class UserResponsePrivacyFields with _$UserResponsePrivacyFields {
   final bool banned;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> blockedUserIds;
 
   @override
@@ -54,6 +55,7 @@ class UserResponsePrivacyFields with _$UserResponsePrivacyFields {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
@@ -97,6 +99,7 @@ class UserResponsePrivacyFields with _$UserResponsePrivacyFields {
   final String role;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> teams;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/user_response_privacy_fields.g.dart b/packages/stream_feeds/lib/src/generated/api/model/user_response_privacy_fields.g.dart
index bc2c4595..8b3ec507 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/user_response_privacy_fields.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/user_response_privacy_fields.g.dart
@@ -11,16 +11,16 @@ UserResponsePrivacyFields _$UserResponsePrivacyFieldsFromJson(
 ) => UserResponsePrivacyFields(
   avgResponseTime: (json['avg_response_time'] as num?)?.toInt(),
   banned: json['banned'] as bool,
-  blockedUserIds: (json['blocked_user_ids'] as List<dynamic>).map((e) => e as String).toList(),
+  blockedUserIds: (json['blocked_user_ids'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
-  deactivatedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  deactivatedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deactivated_at'],
     const EpochDateTimeConverter().fromJson,
   ),
-  deletedAt: _$JsonConverterFromJson<int, DateTime>(
+  deletedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['deleted_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -28,7 +28,7 @@ UserResponsePrivacyFields _$UserResponsePrivacyFieldsFromJson(
   image: json['image'] as String?,
   invisible: json['invisible'] as bool?,
   language: json['language'] as String,
-  lastActive: _$JsonConverterFromJson<int, DateTime>(
+  lastActive: _$JsonConverterFromJson<Object, DateTime>(
     json['last_active'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -39,17 +39,17 @@ UserResponsePrivacyFields _$UserResponsePrivacyFieldsFromJson(
       : PrivacySettingsResponse.fromJson(
           json['privacy_settings'] as Map<String, dynamic>,
         ),
-  revokeTokensIssuedBefore: _$JsonConverterFromJson<int, DateTime>(
+  revokeTokensIssuedBefore: _$JsonConverterFromJson<Object, DateTime>(
     json['revoke_tokens_issued_before'],
     const EpochDateTimeConverter().fromJson,
   ),
   role: json['role'] as String,
-  teams: (json['teams'] as List<dynamic>).map((e) => e as String).toList(),
+  teams: (json['teams'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
   teamsRole: (json['teams_role'] as Map<String, dynamic>?)?.map(
     (k, e) => MapEntry(k, e as String),
   ),
   updatedAt: const EpochDateTimeConverter().fromJson(
-    (json['updated_at'] as num).toInt(),
+    json['updated_at'] as Object,
   ),
 );
 
@@ -61,11 +61,11 @@ Map<String, dynamic> _$UserResponsePrivacyFieldsToJson(
   'blocked_user_ids': instance.blockedUserIds,
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'deactivated_at': _$JsonConverterToJson<int, DateTime>(
+  'deactivated_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deactivatedAt,
     const EpochDateTimeConverter().toJson,
   ),
-  'deleted_at': _$JsonConverterToJson<int, DateTime>(
+  'deleted_at': _$JsonConverterToJson<Object, DateTime>(
     instance.deletedAt,
     const EpochDateTimeConverter().toJson,
   ),
@@ -73,14 +73,14 @@ Map<String, dynamic> _$UserResponsePrivacyFieldsToJson(
   'image': instance.image,
   'invisible': instance.invisible,
   'language': instance.language,
-  'last_active': _$JsonConverterToJson<int, DateTime>(
+  'last_active': _$JsonConverterToJson<Object, DateTime>(
     instance.lastActive,
     const EpochDateTimeConverter().toJson,
   ),
   'name': instance.name,
   'online': instance.online,
   'privacy_settings': instance.privacySettings?.toJson(),
-  'revoke_tokens_issued_before': _$JsonConverterToJson<int, DateTime>(
+  'revoke_tokens_issued_before': _$JsonConverterToJson<Object, DateTime>(
     instance.revokeTokensIssuedBefore,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/user_unbanned_event.dart b/packages/stream_feeds/lib/src/generated/api/model/user_unbanned_event.dart
index b10ecd39..f72f962a 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/user_unbanned_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/user_unbanned_event.dart
@@ -60,6 +60,7 @@ class UserUnbannedEvent extends core.WsEvent with _$UserUnbannedEvent {
   final UserResponseCommonFields? createdBy;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/user_unbanned_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/user_unbanned_event.g.dart
index 24433c70..13f789ec 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/user_unbanned_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/user_unbanned_event.g.dart
@@ -14,15 +14,15 @@ UserUnbannedEvent _$UserUnbannedEventFromJson(Map<String, dynamic> json) => User
   channelType: json['channel_type'] as String?,
   cid: json['cid'] as String?,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   createdBy: json['created_by'] == null
       ? null
       : UserResponseCommonFields.fromJson(
           json['created_by'] as Map<String, dynamic>,
         ),
-  custom: json['custom'] as Map<String, dynamic>,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -44,7 +44,7 @@ Map<String, dynamic> _$UserUnbannedEventToJson(UserUnbannedEvent instance) => <S
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'created_by': instance.createdBy?.toJson(),
   'custom': instance.custom,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/user_updated_event.dart b/packages/stream_feeds/lib/src/generated/api/model/user_updated_event.dart
index 4b03116e..b26e4373 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/user_updated_event.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/user_updated_event.dart
@@ -30,6 +30,7 @@ class UserUpdatedEvent extends core.WsEvent with _$UserUpdatedEvent {
   final DateTime createdAt;
 
   @override
+  @JsonKey(defaultValue: {})
   final Map<String, Object?> custom;
 
   @override
diff --git a/packages/stream_feeds/lib/src/generated/api/model/user_updated_event.g.dart b/packages/stream_feeds/lib/src/generated/api/model/user_updated_event.g.dart
index 13e99aad..1bc51945 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/user_updated_event.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/user_updated_event.g.dart
@@ -8,10 +8,10 @@ part of 'user_updated_event.dart';
 
 UserUpdatedEvent _$UserUpdatedEventFromJson(Map<String, dynamic> json) => UserUpdatedEvent(
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
-  custom: json['custom'] as Map<String, dynamic>,
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
+  custom: json['custom'] as Map<String, dynamic>? ?? {},
+  receivedAt: _$JsonConverterFromJson<Object, DateTime>(
     json['received_at'],
     const EpochDateTimeConverter().fromJson,
   ),
@@ -24,7 +24,7 @@ UserUpdatedEvent _$UserUpdatedEventFromJson(Map<String, dynamic> json) => UserUp
 Map<String, dynamic> _$UserUpdatedEventToJson(UserUpdatedEvent instance) => <String, dynamic>{
   'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
   'custom': instance.custom,
-  'received_at': _$JsonConverterToJson<int, DateTime>(
+  'received_at': _$JsonConverterToJson<Object, DateTime>(
     instance.receivedAt,
     const EpochDateTimeConverter().toJson,
   ),
diff --git a/packages/stream_feeds/lib/src/generated/api/model/velocity_filter_config.dart b/packages/stream_feeds/lib/src/generated/api/model/velocity_filter_config.dart
index f03f1ebd..9b4f3e55 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/velocity_filter_config.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/velocity_filter_config.dart
@@ -46,6 +46,7 @@ class VelocityFilterConfig with _$VelocityFilterConfig {
   final bool firstMessageOnly;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<VelocityFilterConfigRule> rules;
 
   Map<String, dynamic> toJson() => _$VelocityFilterConfigToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/velocity_filter_config.g.dart b/packages/stream_feeds/lib/src/generated/api/model/velocity_filter_config.g.dart
index e8ddb322..74f857ac 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/velocity_filter_config.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/velocity_filter_config.g.dart
@@ -15,9 +15,13 @@ VelocityFilterConfig _$VelocityFilterConfigFromJson(
   cidsPerUser: (json['cids_per_user'] as num).toInt(),
   enabled: json['enabled'] as bool,
   firstMessageOnly: json['first_message_only'] as bool,
-  rules: (json['rules'] as List<dynamic>)
-      .map((e) => VelocityFilterConfigRule.fromJson(e as Map<String, dynamic>))
-      .toList(),
+  rules:
+      (json['rules'] as List<dynamic>?)
+          ?.map(
+            (e) => VelocityFilterConfigRule.fromJson(e as Map<String, dynamic>),
+          )
+          .toList() ??
+      [],
 );
 
 Map<String, dynamic> _$VelocityFilterConfigToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/model/video_call_rule_config.dart b/packages/stream_feeds/lib/src/generated/api/model/video_call_rule_config.dart
index 9dfa1d78..3f57bc96 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/video_call_rule_config.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/video_call_rule_config.dart
@@ -27,9 +27,11 @@ class VideoCallRuleConfig with _$VideoCallRuleConfig {
   final bool flagAllLabels;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<String> flaggedLabels;
 
   @override
+  @JsonKey(defaultValue: [])
   final List<HarmConfig> rules;
 
   Map<String, dynamic> toJson() => _$VideoCallRuleConfigToJson(this);
diff --git a/packages/stream_feeds/lib/src/generated/api/model/video_call_rule_config.g.dart b/packages/stream_feeds/lib/src/generated/api/model/video_call_rule_config.g.dart
index d704484b..d3bad893 100644
--- a/packages/stream_feeds/lib/src/generated/api/model/video_call_rule_config.g.dart
+++ b/packages/stream_feeds/lib/src/generated/api/model/video_call_rule_config.g.dart
@@ -8,8 +8,8 @@ part of 'video_call_rule_config.dart';
 
 VideoCallRuleConfig _$VideoCallRuleConfigFromJson(Map<String, dynamic> json) => VideoCallRuleConfig(
   flagAllLabels: json['flag_all_labels'] as bool,
-  flaggedLabels: (json['flagged_labels'] as List<dynamic>).map((e) => e as String).toList(),
-  rules: (json['rules'] as List<dynamic>).map((e) => HarmConfig.fromJson(e as Map<String, dynamic>)).toList(),
+  flaggedLabels: (json['flagged_labels'] as List<dynamic>?)?.map((e) => e as String).toList() ?? [],
+  rules: (json['rules'] as List<dynamic>?)?.map((e) => HarmConfig.fromJson(e as Map<String, dynamic>)).toList() ?? [],
 );
 
 Map<String, dynamic> _$VideoCallRuleConfigToJson(
diff --git a/packages/stream_feeds/lib/src/generated/api/models.dart b/packages/stream_feeds/lib/src/generated/api/models.dart
index 6cef0178..3fb0d7f9 100644
--- a/packages/stream_feeds/lib/src/generated/api/models.dart
+++ b/packages/stream_feeds/lib/src/generated/api/models.dart
@@ -489,17 +489,33 @@ export 'model/ws_auth_message.dart';
 export 'model/ws_client_event.dart';
 export 'model/ws_event.dart';
 
-/// A [JsonConverter] that converts between [DateTime] and epoch nanoseconds as [int].
+/// A [JsonConverter] for the API's [DateTime] fields.
 ///
-/// - `fromJson`: Converts an integer (nanoseconds since epoch) to a [DateTime].
-/// - `toJson`: Converts a [DateTime] to an integer (nanoseconds since epoch).
-class EpochDateTimeConverter implements JsonConverter<DateTime, int> {
+/// Depending on the product, the backend encodes timestamps either as
+/// ISO-8601 strings (e.g. the video coordinator) or as epoch nanoseconds
+/// (e.g. feeds, generated with `--encode-time-as-unix-timestamp`). The same
+/// generated client must read both, so this converter accepts either form:
+///
+/// - `fromJson`: parses an ISO-8601 [String] or epoch-nanoseconds [num] into a
+///   UTC [DateTime].
+/// - `toJson`: emits an ISO-8601 [String]; the backend accepts RFC3339 on
+///   request bodies regardless of how it encodes responses.
+class EpochDateTimeConverter implements JsonConverter<DateTime, Object> {
   /// Creates a constant [EpochDateTimeConverter].
   const EpochDateTimeConverter();
 
   @override
-  DateTime fromJson(int json) => DateTime.fromMicrosecondsSinceEpoch(json ~/ 1000);
+  DateTime fromJson(Object json) {
+    if (json is String) {
+      return DateTime.parse(json).toUtc();
+    }
+    if (json is num) {
+      // Epoch nanoseconds -> microseconds.
+      return DateTime.fromMicrosecondsSinceEpoch(json ~/ 1000, isUtc: true);
+    }
+    throw ArgumentError('Cannot convert $json (${json.runtimeType}) to DateTime');
+  }
 
   @override
-  int toJson(DateTime object) => object.microsecondsSinceEpoch * 1000;
+  Object toJson(DateTime object) => object.toUtc().toIso8601String();
 }
diff --git a/packages/stream_feeds/lib/src/models/activity_data.freezed.dart b/packages/stream_feeds/lib/src/models/activity_data.freezed.dart
index d9786c54..e27bf2dc 100644
--- a/packages/stream_feeds/lib/src/models/activity_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/activity_data.freezed.dart
@@ -62,10 +62,11 @@ mixin _$ActivityData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $ActivityDataCopyWith<ActivityData> get copyWith => _$ActivityDataCopyWithImpl<ActivityData>(
-    this as ActivityData,
-    _$identity,
-  );
+  $ActivityDataCopyWith<ActivityData> get copyWith =>
+      _$ActivityDataCopyWithImpl<ActivityData>(
+        this as ActivityData,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -76,18 +77,25 @@ mixin _$ActivityData {
               other.attachments,
               attachments,
             ) &&
-            (identical(other.bookmarkCount, bookmarkCount) || other.bookmarkCount == bookmarkCount) &&
+            (identical(other.bookmarkCount, bookmarkCount) ||
+                other.bookmarkCount == bookmarkCount) &&
             const DeepCollectionEquality().equals(
               other.collections,
               collections,
             ) &&
-            (identical(other.commentCount, commentCount) || other.commentCount == commentCount) &&
+            (identical(other.commentCount, commentCount) ||
+                other.commentCount == commentCount) &&
             const DeepCollectionEquality().equals(other.comments, comments) &&
-            (identical(other.createdAt, createdAt) || other.createdAt == createdAt) &&
-            (identical(other.currentFeed, currentFeed) || other.currentFeed == currentFeed) &&
-            (identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt) &&
-            (identical(other.editedAt, editedAt) || other.editedAt == editedAt) &&
-            (identical(other.expiresAt, expiresAt) || other.expiresAt == expiresAt) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
+            (identical(other.currentFeed, currentFeed) ||
+                other.currentFeed == currentFeed) &&
+            (identical(other.deletedAt, deletedAt) ||
+                other.deletedAt == deletedAt) &&
+            (identical(other.editedAt, editedAt) ||
+                other.editedAt == editedAt) &&
+            (identical(other.expiresAt, expiresAt) ||
+                other.expiresAt == expiresAt) &&
             const DeepCollectionEquality().equals(other.feeds, feeds) &&
             const DeepCollectionEquality().equals(
               other.filterTags,
@@ -106,18 +114,21 @@ mixin _$ActivityData {
             ) &&
             (identical(other.isRead, isRead) || other.isRead == isRead) &&
             (identical(other.isSeen, isSeen) || other.isSeen == isSeen) &&
-            (identical(other.isWatched, isWatched) || other.isWatched == isWatched) &&
+            (identical(other.isWatched, isWatched) ||
+                other.isWatched == isWatched) &&
             const DeepCollectionEquality().equals(
               other.latestReactions,
               latestReactions,
             ) &&
-            (identical(other.location, location) || other.location == location) &&
+            (identical(other.location, location) ||
+                other.location == location) &&
             const DeepCollectionEquality().equals(
               other.mentionedUsers,
               mentionedUsers,
             ) &&
             const DeepCollectionEquality().equals(other.metrics, metrics) &&
-            (identical(other.moderation, moderation) || other.moderation == moderation) &&
+            (identical(other.moderation, moderation) ||
+                other.moderation == moderation) &&
             (identical(other.notificationContext, notificationContext) ||
                 other.notificationContext == notificationContext) &&
             const DeepCollectionEquality().equals(
@@ -130,10 +141,12 @@ mixin _$ActivityData {
             ) &&
             (identical(other.parent, parent) || other.parent == parent) &&
             (identical(other.poll, poll) || other.poll == poll) &&
-            (identical(other.popularity, popularity) || other.popularity == popularity) &&
+            (identical(other.popularity, popularity) ||
+                other.popularity == popularity) &&
             (identical(other.hidden, hidden) || other.hidden == hidden) &&
             (identical(other.preview, preview) || other.preview == preview) &&
-            (identical(other.reactionCount, reactionCount) || other.reactionCount == reactionCount) &&
+            (identical(other.reactionCount, reactionCount) ||
+                other.reactionCount == reactionCount) &&
             const DeepCollectionEquality().equals(
               other.reactionGroups,
               reactionGroups,
@@ -143,13 +156,17 @@ mixin _$ActivityData {
               other.searchData,
               searchData,
             ) &&
-            (identical(other.shareCount, shareCount) || other.shareCount == shareCount) &&
+            (identical(other.shareCount, shareCount) ||
+                other.shareCount == shareCount) &&
             (identical(other.text, text) || other.text == text) &&
             (identical(other.type, type) || other.type == type) &&
-            (identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt) &&
+            (identical(other.updatedAt, updatedAt) ||
+                other.updatedAt == updatedAt) &&
             (identical(other.user, user) || other.user == user) &&
-            (identical(other.visibility, visibility) || other.visibility == visibility) &&
-            (identical(other.visibilityTag, visibilityTag) || other.visibilityTag == visibilityTag) &&
+            (identical(other.visibility, visibility) ||
+                other.visibility == visibility) &&
+            (identical(other.visibilityTag, visibilityTag) ||
+                other.visibilityTag == visibilityTag) &&
             const DeepCollectionEquality().equals(other.custom, custom));
   }
 
diff --git a/packages/stream_feeds/lib/src/models/activity_pin_data.freezed.dart b/packages/stream_feeds/lib/src/models/activity_pin_data.freezed.dart
index 6f749e4e..47c8e368 100644
--- a/packages/stream_feeds/lib/src/models/activity_pin_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/activity_pin_data.freezed.dart
@@ -23,25 +23,30 @@ mixin _$ActivityPinData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $ActivityPinDataCopyWith<ActivityPinData> get copyWith => _$ActivityPinDataCopyWithImpl<ActivityPinData>(
-    this as ActivityPinData,
-    _$identity,
-  );
+  $ActivityPinDataCopyWith<ActivityPinData> get copyWith =>
+      _$ActivityPinDataCopyWithImpl<ActivityPinData>(
+        this as ActivityPinData,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is ActivityPinData &&
-            (identical(other.activity, activity) || other.activity == activity) &&
-            (identical(other.createdAt, createdAt) || other.createdAt == createdAt) &&
+            (identical(other.activity, activity) ||
+                other.activity == activity) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
             (identical(other.fid, fid) || other.fid == fid) &&
-            (identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt) &&
+            (identical(other.updatedAt, updatedAt) ||
+                other.updatedAt == updatedAt) &&
             (identical(other.userId, userId) || other.userId == userId));
   }
 
   @override
-  int get hashCode => Object.hash(runtimeType, activity, createdAt, fid, updatedAt, userId);
+  int get hashCode =>
+      Object.hash(runtimeType, activity, createdAt, fid, updatedAt, userId);
 
   @override
   String toString() {
@@ -66,7 +71,8 @@ abstract mixin class $ActivityPinDataCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$ActivityPinDataCopyWithImpl<$Res> implements $ActivityPinDataCopyWith<$Res> {
+class _$ActivityPinDataCopyWithImpl<$Res>
+    implements $ActivityPinDataCopyWith<$Res> {
   _$ActivityPinDataCopyWithImpl(this._self, this._then);
 
   final ActivityPinData _self;
diff --git a/packages/stream_feeds/lib/src/models/aggregated_activity_data.freezed.dart b/packages/stream_feeds/lib/src/models/aggregated_activity_data.freezed.dart
index 83c2eec6..d174dd45 100644
--- a/packages/stream_feeds/lib/src/models/aggregated_activity_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/aggregated_activity_data.freezed.dart
@@ -42,14 +42,18 @@ mixin _$AggregatedActivityData {
               other.activities,
               activities,
             ) &&
-            (identical(other.activityCount, activityCount) || other.activityCount == activityCount) &&
-            (identical(other.createdAt, createdAt) || other.createdAt == createdAt) &&
+            (identical(other.activityCount, activityCount) ||
+                other.activityCount == activityCount) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
             (identical(other.group, group) || other.group == group) &&
             (identical(other.isRead, isRead) || other.isRead == isRead) &&
             (identical(other.isSeen, isSeen) || other.isSeen == isSeen) &&
             (identical(other.score, score) || other.score == score) &&
-            (identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt) &&
-            (identical(other.userCount, userCount) || other.userCount == userCount));
+            (identical(other.updatedAt, updatedAt) ||
+                other.updatedAt == updatedAt) &&
+            (identical(other.userCount, userCount) ||
+                other.userCount == userCount));
   }
 
   @override
@@ -93,7 +97,8 @@ abstract mixin class $AggregatedActivityDataCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$AggregatedActivityDataCopyWithImpl<$Res> implements $AggregatedActivityDataCopyWith<$Res> {
+class _$AggregatedActivityDataCopyWithImpl<$Res>
+    implements $AggregatedActivityDataCopyWith<$Res> {
   _$AggregatedActivityDataCopyWithImpl(this._self, this._then);
 
   final AggregatedActivityData _self;
diff --git a/packages/stream_feeds/lib/src/models/app_data.freezed.dart b/packages/stream_feeds/lib/src/models/app_data.freezed.dart
index f27b336c..b1fb5210 100644
--- a/packages/stream_feeds/lib/src/models/app_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/app_data.freezed.dart
@@ -23,7 +23,8 @@ mixin _$AppData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $AppDataCopyWith<AppData> get copyWith => _$AppDataCopyWithImpl<AppData>(this as AppData, _$identity);
+  $AppDataCopyWith<AppData> get copyWith =>
+      _$AppDataCopyWithImpl<AppData>(this as AppData, _$identity);
 
   @override
   bool operator ==(Object other) {
@@ -34,8 +35,10 @@ mixin _$AppData {
                 other.asyncUrlEnrichEnabled == asyncUrlEnrichEnabled) &&
             (identical(other.autoTranslationEnabled, autoTranslationEnabled) ||
                 other.autoTranslationEnabled == autoTranslationEnabled) &&
-            (identical(other.fileUploadConfig, fileUploadConfig) || other.fileUploadConfig == fileUploadConfig) &&
-            (identical(other.imageUploadConfig, imageUploadConfig) || other.imageUploadConfig == imageUploadConfig) &&
+            (identical(other.fileUploadConfig, fileUploadConfig) ||
+                other.fileUploadConfig == fileUploadConfig) &&
+            (identical(other.imageUploadConfig, imageUploadConfig) ||
+                other.imageUploadConfig == imageUploadConfig) &&
             (identical(other.name, name) || other.name == name));
   }
 
@@ -57,7 +60,8 @@ mixin _$AppData {
 
 /// @nodoc
 abstract mixin class $AppDataCopyWith<$Res> {
-  factory $AppDataCopyWith(AppData value, $Res Function(AppData) _then) = _$AppDataCopyWithImpl;
+  factory $AppDataCopyWith(AppData value, $Res Function(AppData) _then) =
+      _$AppDataCopyWithImpl;
   @useResult
   $Res call({
     bool asyncUrlEnrichEnabled,
diff --git a/packages/stream_feeds/lib/src/models/batch_follow_data.freezed.dart b/packages/stream_feeds/lib/src/models/batch_follow_data.freezed.dart
index f1e6fc19..46ea4294 100644
--- a/packages/stream_feeds/lib/src/models/batch_follow_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/batch_follow_data.freezed.dart
@@ -20,10 +20,11 @@ mixin _$BatchFollowData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $BatchFollowDataCopyWith<BatchFollowData> get copyWith => _$BatchFollowDataCopyWithImpl<BatchFollowData>(
-    this as BatchFollowData,
-    _$identity,
-  );
+  $BatchFollowDataCopyWith<BatchFollowData> get copyWith =>
+      _$BatchFollowDataCopyWithImpl<BatchFollowData>(
+        this as BatchFollowData,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -58,7 +59,8 @@ abstract mixin class $BatchFollowDataCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$BatchFollowDataCopyWithImpl<$Res> implements $BatchFollowDataCopyWith<$Res> {
+class _$BatchFollowDataCopyWithImpl<$Res>
+    implements $BatchFollowDataCopyWith<$Res> {
   _$BatchFollowDataCopyWithImpl(this._self, this._then);
 
   final BatchFollowData _self;
diff --git a/packages/stream_feeds/lib/src/models/bookmark_data.freezed.dart b/packages/stream_feeds/lib/src/models/bookmark_data.freezed.dart
index fc3a36e2..bedfdbb8 100644
--- a/packages/stream_feeds/lib/src/models/bookmark_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/bookmark_data.freezed.dart
@@ -24,20 +24,24 @@ mixin _$BookmarkData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $BookmarkDataCopyWith<BookmarkData> get copyWith => _$BookmarkDataCopyWithImpl<BookmarkData>(
-    this as BookmarkData,
-    _$identity,
-  );
+  $BookmarkDataCopyWith<BookmarkData> get copyWith =>
+      _$BookmarkDataCopyWithImpl<BookmarkData>(
+        this as BookmarkData,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is BookmarkData &&
-            (identical(other.activity, activity) || other.activity == activity) &&
-            (identical(other.createdAt, createdAt) || other.createdAt == createdAt) &&
+            (identical(other.activity, activity) ||
+                other.activity == activity) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
             (identical(other.folder, folder) || other.folder == folder) &&
-            (identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt) &&
+            (identical(other.updatedAt, updatedAt) ||
+                other.updatedAt == updatedAt) &&
             (identical(other.user, user) || other.user == user) &&
             const DeepCollectionEquality().equals(other.custom, custom));
   }
diff --git a/packages/stream_feeds/lib/src/models/bookmark_folder_data.freezed.dart b/packages/stream_feeds/lib/src/models/bookmark_folder_data.freezed.dart
index 7fd7810a..18176656 100644
--- a/packages/stream_feeds/lib/src/models/bookmark_folder_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/bookmark_folder_data.freezed.dart
@@ -24,21 +24,24 @@ mixin _$BookmarkFolderData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $BookmarkFolderDataCopyWith<BookmarkFolderData> get copyWith => _$BookmarkFolderDataCopyWithImpl<BookmarkFolderData>(
-    this as BookmarkFolderData,
-    _$identity,
-  );
+  $BookmarkFolderDataCopyWith<BookmarkFolderData> get copyWith =>
+      _$BookmarkFolderDataCopyWithImpl<BookmarkFolderData>(
+        this as BookmarkFolderData,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is BookmarkFolderData &&
-            (identical(other.createdAt, createdAt) || other.createdAt == createdAt) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
             (identical(other.id, id) || other.id == id) &&
             (identical(other.name, name) || other.name == name) &&
             (identical(other.user, user) || other.user == user) &&
-            (identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt) &&
+            (identical(other.updatedAt, updatedAt) ||
+                other.updatedAt == updatedAt) &&
             const DeepCollectionEquality().equals(other.custom, custom));
   }
 
@@ -77,7 +80,8 @@ abstract mixin class $BookmarkFolderDataCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$BookmarkFolderDataCopyWithImpl<$Res> implements $BookmarkFolderDataCopyWith<$Res> {
+class _$BookmarkFolderDataCopyWithImpl<$Res>
+    implements $BookmarkFolderDataCopyWith<$Res> {
   _$BookmarkFolderDataCopyWithImpl(this._self, this._then);
 
   final BookmarkFolderData _self;
diff --git a/packages/stream_feeds/lib/src/models/collection_data.freezed.dart b/packages/stream_feeds/lib/src/models/collection_data.freezed.dart
index 5286a1c5..dec3217d 100644
--- a/packages/stream_feeds/lib/src/models/collection_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/collection_data.freezed.dart
@@ -25,10 +25,11 @@ mixin _$CollectionData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $CollectionDataCopyWith<CollectionData> get copyWith => _$CollectionDataCopyWithImpl<CollectionData>(
-    this as CollectionData,
-    _$identity,
-  );
+  $CollectionDataCopyWith<CollectionData> get copyWith =>
+      _$CollectionDataCopyWithImpl<CollectionData>(
+        this as CollectionData,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -38,8 +39,10 @@ mixin _$CollectionData {
             (identical(other.id, id) || other.id == id) &&
             (identical(other.name, name) || other.name == name) &&
             (identical(other.status, status) || other.status == status) &&
-            (identical(other.createdAt, createdAt) || other.createdAt == createdAt) &&
-            (identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
+            (identical(other.updatedAt, updatedAt) ||
+                other.updatedAt == updatedAt) &&
             (identical(other.userId, userId) || other.userId == userId) &&
             const DeepCollectionEquality().equals(other.custom, custom));
   }
@@ -81,7 +84,8 @@ abstract mixin class $CollectionDataCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$CollectionDataCopyWithImpl<$Res> implements $CollectionDataCopyWith<$Res> {
+class _$CollectionDataCopyWithImpl<$Res>
+    implements $CollectionDataCopyWith<$Res> {
   _$CollectionDataCopyWithImpl(this._self, this._then);
 
   final CollectionData _self;
diff --git a/packages/stream_feeds/lib/src/models/comment_data.freezed.dart b/packages/stream_feeds/lib/src/models/comment_data.freezed.dart
index 19d31b87..7b6d035c 100644
--- a/packages/stream_feeds/lib/src/models/comment_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/comment_data.freezed.dart
@@ -58,13 +58,20 @@ mixin _$CommentData {
               other.attachments,
               attachments,
             ) &&
-            (identical(other.bookmarkCount, bookmarkCount) || other.bookmarkCount == bookmarkCount) &&
-            (identical(other.confidenceScore, confidenceScore) || other.confidenceScore == confidenceScore) &&
-            (identical(other.controversyScore, controversyScore) || other.controversyScore == controversyScore) &&
-            (identical(other.createdAt, createdAt) || other.createdAt == createdAt) &&
-            (identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt) &&
-            (identical(other.editedAt, editedAt) || other.editedAt == editedAt) &&
-            (identical(other.downvoteCount, downvoteCount) || other.downvoteCount == downvoteCount) &&
+            (identical(other.bookmarkCount, bookmarkCount) ||
+                other.bookmarkCount == bookmarkCount) &&
+            (identical(other.confidenceScore, confidenceScore) ||
+                other.confidenceScore == confidenceScore) &&
+            (identical(other.controversyScore, controversyScore) ||
+                other.controversyScore == controversyScore) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
+            (identical(other.deletedAt, deletedAt) ||
+                other.deletedAt == deletedAt) &&
+            (identical(other.editedAt, editedAt) ||
+                other.editedAt == editedAt) &&
+            (identical(other.downvoteCount, downvoteCount) ||
+                other.downvoteCount == downvoteCount) &&
             (identical(other.id, id) || other.id == id) &&
             const DeepCollectionEquality().equals(
               other.latestReactions,
@@ -75,26 +82,34 @@ mixin _$CommentData {
               mentionedUsers,
             ) &&
             (identical(other.meta, meta) || other.meta == meta) &&
-            (identical(other.moderation, moderation) || other.moderation == moderation) &&
-            (identical(other.objectId, objectId) || other.objectId == objectId) &&
-            (identical(other.objectType, objectType) || other.objectType == objectType) &&
+            (identical(other.moderation, moderation) ||
+                other.moderation == moderation) &&
+            (identical(other.objectId, objectId) ||
+                other.objectId == objectId) &&
+            (identical(other.objectType, objectType) ||
+                other.objectType == objectType) &&
             const DeepCollectionEquality().equals(
               other.ownReactions,
               ownReactions,
             ) &&
-            (identical(other.parentId, parentId) || other.parentId == parentId) &&
-            (identical(other.reactionCount, reactionCount) || other.reactionCount == reactionCount) &&
+            (identical(other.parentId, parentId) ||
+                other.parentId == parentId) &&
+            (identical(other.reactionCount, reactionCount) ||
+                other.reactionCount == reactionCount) &&
             const DeepCollectionEquality().equals(
               other.reactionGroups,
               reactionGroups,
             ) &&
             const DeepCollectionEquality().equals(other.replies, replies) &&
-            (identical(other.replyCount, replyCount) || other.replyCount == replyCount) &&
+            (identical(other.replyCount, replyCount) ||
+                other.replyCount == replyCount) &&
             (identical(other.score, score) || other.score == score) &&
             (identical(other.status, status) || other.status == status) &&
             (identical(other.text, text) || other.text == text) &&
-            (identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt) &&
-            (identical(other.upvoteCount, upvoteCount) || other.upvoteCount == upvoteCount) &&
+            (identical(other.updatedAt, updatedAt) ||
+                other.updatedAt == updatedAt) &&
+            (identical(other.upvoteCount, upvoteCount) ||
+                other.upvoteCount == upvoteCount) &&
             (identical(other.user, user) || other.user == user) &&
             const DeepCollectionEquality().equals(other.custom, custom));
   }
diff --git a/packages/stream_feeds/lib/src/models/feed_data.dart b/packages/stream_feeds/lib/src/models/feed_data.dart
index 007bbc25..8664eece 100644
--- a/packages/stream_feeds/lib/src/models/feed_data.dart
+++ b/packages/stream_feeds/lib/src/models/feed_data.dart
@@ -158,7 +158,7 @@ extension FeedResponseMapper on FeedResponse {
       ),
       memberCount: memberCount,
       name: name,
-      ownCapabilities: ownCapabilities?.map((e) => e.toModel()).toList() ?? const [],
+      ownCapabilities: ownCapabilities ?? const [],
       ownMembership: ownMembership?.toModel(),
       ownFollowings: ownFollowings?.map((f) => f.toModel()).toList(),
       ownFollows: ownFollows?.map((f) => f.toModel()).toList(),
@@ -170,13 +170,6 @@ extension FeedResponseMapper on FeedResponse {
   }
 }
 
-/// Extension functions for [FeedData] to handle common operations.
-/// Extension to map [FeedResponseOwnCapabilities] to the canonical [FeedOwnCapability].
-extension FeedResponseOwnCapabilitiesMapper on FeedResponseOwnCapabilities {
-  /// Converts this response-specific capability enum to the canonical [FeedOwnCapability].
-  FeedOwnCapability toModel() => FeedOwnCapability.values.byName(name);
-}
-
 /// Extension to map [FeedResponseVisibility] to its wire-value string.
 extension FeedResponseVisibilityMapper on FeedResponseVisibility {
   /// Returns the API wire value string for this visibility.
diff --git a/packages/stream_feeds/lib/src/models/feed_data.freezed.dart b/packages/stream_feeds/lib/src/models/feed_data.freezed.dart
index bd7c4225..d42712e5 100644
--- a/packages/stream_feeds/lib/src/models/feed_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/feed_data.freezed.dart
@@ -40,35 +40,46 @@ mixin _$FeedData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $FeedDataCopyWith<FeedData> get copyWith => _$FeedDataCopyWithImpl<FeedData>(this as FeedData, _$identity);
+  $FeedDataCopyWith<FeedData> get copyWith =>
+      _$FeedDataCopyWithImpl<FeedData>(this as FeedData, _$identity);
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is FeedData &&
-            (identical(other.activityCount, activityCount) || other.activityCount == activityCount) &&
-            (identical(other.createdAt, createdAt) || other.createdAt == createdAt) &&
-            (identical(other.createdBy, createdBy) || other.createdBy == createdBy) &&
-            (identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt) &&
-            (identical(other.description, description) || other.description == description) &&
+            (identical(other.activityCount, activityCount) ||
+                other.activityCount == activityCount) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
+            (identical(other.createdBy, createdBy) ||
+                other.createdBy == createdBy) &&
+            (identical(other.deletedAt, deletedAt) ||
+                other.deletedAt == deletedAt) &&
+            (identical(other.description, description) ||
+                other.description == description) &&
             (identical(other.fid, fid) || other.fid == fid) &&
             const DeepCollectionEquality().equals(
               other.filterTags,
               filterTags,
             ) &&
-            (identical(other.followerCount, followerCount) || other.followerCount == followerCount) &&
-            (identical(other.followingCount, followingCount) || other.followingCount == followingCount) &&
+            (identical(other.followerCount, followerCount) ||
+                other.followerCount == followerCount) &&
+            (identical(other.followingCount, followingCount) ||
+                other.followingCount == followingCount) &&
             (identical(other.groupId, groupId) || other.groupId == groupId) &&
             (identical(other.id, id) || other.id == id) &&
-            (identical(other.location, location) || other.location == location) &&
-            (identical(other.memberCount, memberCount) || other.memberCount == memberCount) &&
+            (identical(other.location, location) ||
+                other.location == location) &&
+            (identical(other.memberCount, memberCount) ||
+                other.memberCount == memberCount) &&
             (identical(other.name, name) || other.name == name) &&
             const DeepCollectionEquality().equals(
               other.ownCapabilities,
               ownCapabilities,
             ) &&
-            (identical(other.ownMembership, ownMembership) || other.ownMembership == ownMembership) &&
+            (identical(other.ownMembership, ownMembership) ||
+                other.ownMembership == ownMembership) &&
             const DeepCollectionEquality().equals(
               other.ownFollowings,
               ownFollowings,
@@ -77,9 +88,12 @@ mixin _$FeedData {
               other.ownFollows,
               ownFollows,
             ) &&
-            (identical(other.pinCount, pinCount) || other.pinCount == pinCount) &&
-            (identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt) &&
-            (identical(other.visibility, visibility) || other.visibility == visibility) &&
+            (identical(other.pinCount, pinCount) ||
+                other.pinCount == pinCount) &&
+            (identical(other.updatedAt, updatedAt) ||
+                other.updatedAt == updatedAt) &&
+            (identical(other.visibility, visibility) ||
+                other.visibility == visibility) &&
             const DeepCollectionEquality().equals(other.custom, custom));
   }
 
@@ -118,7 +132,8 @@ mixin _$FeedData {
 
 /// @nodoc
 abstract mixin class $FeedDataCopyWith<$Res> {
-  factory $FeedDataCopyWith(FeedData value, $Res Function(FeedData) _then) = _$FeedDataCopyWithImpl;
+  factory $FeedDataCopyWith(FeedData value, $Res Function(FeedData) _then) =
+      _$FeedDataCopyWithImpl;
   @useResult
   $Res call({
     int activityCount,
diff --git a/packages/stream_feeds/lib/src/models/feed_id.freezed.dart b/packages/stream_feeds/lib/src/models/feed_id.freezed.dart
index 965ada74..0603ca60 100644
--- a/packages/stream_feeds/lib/src/models/feed_id.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/feed_id.freezed.dart
@@ -21,7 +21,8 @@ mixin _$FeedId {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $FeedIdCopyWith<FeedId> get copyWith => _$FeedIdCopyWithImpl<FeedId>(this as FeedId, _$identity);
+  $FeedIdCopyWith<FeedId> get copyWith =>
+      _$FeedIdCopyWithImpl<FeedId>(this as FeedId, _$identity);
 
   @override
   bool operator ==(Object other) {
@@ -30,7 +31,8 @@ mixin _$FeedId {
             other is FeedId &&
             (identical(other.group, group) || other.group == group) &&
             (identical(other.id, id) || other.id == id) &&
-            (identical(other.rawValue, rawValue) || other.rawValue == rawValue));
+            (identical(other.rawValue, rawValue) ||
+                other.rawValue == rawValue));
   }
 
   @override
@@ -44,7 +46,8 @@ mixin _$FeedId {
 
 /// @nodoc
 abstract mixin class $FeedIdCopyWith<$Res> {
-  factory $FeedIdCopyWith(FeedId value, $Res Function(FeedId) _then) = _$FeedIdCopyWithImpl;
+  factory $FeedIdCopyWith(FeedId value, $Res Function(FeedId) _then) =
+      _$FeedIdCopyWithImpl;
   @useResult
   $Res call({String group, String id});
 }
diff --git a/packages/stream_feeds/lib/src/models/feed_input_data.freezed.dart b/packages/stream_feeds/lib/src/models/feed_input_data.freezed.dart
index b0f7499d..cfddc314 100644
--- a/packages/stream_feeds/lib/src/models/feed_input_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/feed_input_data.freezed.dart
@@ -24,19 +24,22 @@ mixin _$FeedInputData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $FeedInputDataCopyWith<FeedInputData> get copyWith => _$FeedInputDataCopyWithImpl<FeedInputData>(
-    this as FeedInputData,
-    _$identity,
-  );
+  $FeedInputDataCopyWith<FeedInputData> get copyWith =>
+      _$FeedInputDataCopyWithImpl<FeedInputData>(
+        this as FeedInputData,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is FeedInputData &&
-            (identical(other.description, description) || other.description == description) &&
+            (identical(other.description, description) ||
+                other.description == description) &&
             (identical(other.name, name) || other.name == name) &&
-            (identical(other.visibility, visibility) || other.visibility == visibility) &&
+            (identical(other.visibility, visibility) ||
+                other.visibility == visibility) &&
             const DeepCollectionEquality().equals(
               other.filterTags,
               filterTags,
@@ -80,7 +83,8 @@ abstract mixin class $FeedInputDataCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$FeedInputDataCopyWithImpl<$Res> implements $FeedInputDataCopyWith<$Res> {
+class _$FeedInputDataCopyWithImpl<$Res>
+    implements $FeedInputDataCopyWith<$Res> {
   _$FeedInputDataCopyWithImpl(this._self, this._then);
 
   final FeedInputData _self;
diff --git a/packages/stream_feeds/lib/src/models/feed_member_data.freezed.dart b/packages/stream_feeds/lib/src/models/feed_member_data.freezed.dart
index ea54e9e5..a91de105 100644
--- a/packages/stream_feeds/lib/src/models/feed_member_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/feed_member_data.freezed.dart
@@ -26,22 +26,27 @@ mixin _$FeedMemberData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $FeedMemberDataCopyWith<FeedMemberData> get copyWith => _$FeedMemberDataCopyWithImpl<FeedMemberData>(
-    this as FeedMemberData,
-    _$identity,
-  );
+  $FeedMemberDataCopyWith<FeedMemberData> get copyWith =>
+      _$FeedMemberDataCopyWithImpl<FeedMemberData>(
+        this as FeedMemberData,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is FeedMemberData &&
-            (identical(other.createdAt, createdAt) || other.createdAt == createdAt) &&
-            (identical(other.inviteAcceptedAt, inviteAcceptedAt) || other.inviteAcceptedAt == inviteAcceptedAt) &&
-            (identical(other.inviteRejectedAt, inviteRejectedAt) || other.inviteRejectedAt == inviteRejectedAt) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
+            (identical(other.inviteAcceptedAt, inviteAcceptedAt) ||
+                other.inviteAcceptedAt == inviteAcceptedAt) &&
+            (identical(other.inviteRejectedAt, inviteRejectedAt) ||
+                other.inviteRejectedAt == inviteRejectedAt) &&
             (identical(other.role, role) || other.role == role) &&
             (identical(other.status, status) || other.status == status) &&
-            (identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt) &&
+            (identical(other.updatedAt, updatedAt) ||
+                other.updatedAt == updatedAt) &&
             (identical(other.user, user) || other.user == user) &&
             const DeepCollectionEquality().equals(other.custom, custom));
   }
@@ -85,7 +90,8 @@ abstract mixin class $FeedMemberDataCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$FeedMemberDataCopyWithImpl<$Res> implements $FeedMemberDataCopyWith<$Res> {
+class _$FeedMemberDataCopyWithImpl<$Res>
+    implements $FeedMemberDataCopyWith<$Res> {
   _$FeedMemberDataCopyWithImpl(this._self, this._then);
 
   final FeedMemberData _self;
diff --git a/packages/stream_feeds/lib/src/models/feed_member_request_data.freezed.dart b/packages/stream_feeds/lib/src/models/feed_member_request_data.freezed.dart
index 02e4d111..002c2cfc 100644
--- a/packages/stream_feeds/lib/src/models/feed_member_request_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/feed_member_request_data.freezed.dart
@@ -70,7 +70,8 @@ abstract mixin class $FeedMemberRequestDataCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$FeedMemberRequestDataCopyWithImpl<$Res> implements $FeedMemberRequestDataCopyWith<$Res> {
+class _$FeedMemberRequestDataCopyWithImpl<$Res>
+    implements $FeedMemberRequestDataCopyWith<$Res> {
   _$FeedMemberRequestDataCopyWithImpl(this._self, this._then);
 
   final FeedMemberRequestData _self;
diff --git a/packages/stream_feeds/lib/src/models/feed_suggestion_data.dart b/packages/stream_feeds/lib/src/models/feed_suggestion_data.dart
index eca72c0a..f2364746 100644
--- a/packages/stream_feeds/lib/src/models/feed_suggestion_data.dart
+++ b/packages/stream_feeds/lib/src/models/feed_suggestion_data.dart
@@ -75,7 +75,7 @@ extension FeedSuggestionResponseMapper on FeedSuggestionResponse {
         ),
         memberCount: memberCount,
         name: name,
-        ownCapabilities: ownCapabilities?.map((e) => e.toModel()).toList() ?? const [],
+        ownCapabilities: ownCapabilities ?? const [],
         ownMembership: ownMembership?.toModel(),
         ownFollowings: ownFollowings?.map((f) => f.toModel()).toList(),
         ownFollows: ownFollows?.map((f) => f.toModel()).toList(),
@@ -91,12 +91,6 @@ extension FeedSuggestionResponseMapper on FeedSuggestionResponse {
   }
 }
 
-/// Extension to map [FeedSuggestionResponseOwnCapabilities] to the canonical [FeedOwnCapability].
-extension FeedSuggestionResponseOwnCapabilitiesMapper on FeedSuggestionResponseOwnCapabilities {
-  /// Converts this response-specific capability enum to the canonical [FeedOwnCapability].
-  FeedOwnCapability toModel() => FeedOwnCapability.values.byName(name);
-}
-
 /// Extension to map [FeedSuggestionResponseVisibility] to its wire-value string.
 extension FeedSuggestionResponseVisibilityMapper on FeedSuggestionResponseVisibility {
   /// Returns the API wire value string for this visibility.
diff --git a/packages/stream_feeds/lib/src/models/feed_suggestion_data.freezed.dart b/packages/stream_feeds/lib/src/models/feed_suggestion_data.freezed.dart
index 95c5b624..5fd2a2c1 100644
--- a/packages/stream_feeds/lib/src/models/feed_suggestion_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/feed_suggestion_data.freezed.dart
@@ -22,10 +22,11 @@ mixin _$FeedSuggestionData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $FeedSuggestionDataCopyWith<FeedSuggestionData> get copyWith => _$FeedSuggestionDataCopyWithImpl<FeedSuggestionData>(
-    this as FeedSuggestionData,
-    _$identity,
-  );
+  $FeedSuggestionDataCopyWith<FeedSuggestionData> get copyWith =>
+      _$FeedSuggestionDataCopyWithImpl<FeedSuggestionData>(
+        this as FeedSuggestionData,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -73,7 +74,8 @@ abstract mixin class $FeedSuggestionDataCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$FeedSuggestionDataCopyWithImpl<$Res> implements $FeedSuggestionDataCopyWith<$Res> {
+class _$FeedSuggestionDataCopyWithImpl<$Res>
+    implements $FeedSuggestionDataCopyWith<$Res> {
   _$FeedSuggestionDataCopyWithImpl(this._self, this._then);
 
   final FeedSuggestionData _self;
diff --git a/packages/stream_feeds/lib/src/models/feeds_reaction_data.freezed.dart b/packages/stream_feeds/lib/src/models/feeds_reaction_data.freezed.dart
index 469c12b1..06f16b10 100644
--- a/packages/stream_feeds/lib/src/models/feeds_reaction_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/feeds_reaction_data.freezed.dart
@@ -25,21 +25,26 @@ mixin _$FeedsReactionData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $FeedsReactionDataCopyWith<FeedsReactionData> get copyWith => _$FeedsReactionDataCopyWithImpl<FeedsReactionData>(
-    this as FeedsReactionData,
-    _$identity,
-  );
+  $FeedsReactionDataCopyWith<FeedsReactionData> get copyWith =>
+      _$FeedsReactionDataCopyWithImpl<FeedsReactionData>(
+        this as FeedsReactionData,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is FeedsReactionData &&
-            (identical(other.activityId, activityId) || other.activityId == activityId) &&
-            (identical(other.commentId, commentId) || other.commentId == commentId) &&
-            (identical(other.createdAt, createdAt) || other.createdAt == createdAt) &&
+            (identical(other.activityId, activityId) ||
+                other.activityId == activityId) &&
+            (identical(other.commentId, commentId) ||
+                other.commentId == commentId) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
             (identical(other.type, type) || other.type == type) &&
-            (identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt) &&
+            (identical(other.updatedAt, updatedAt) ||
+                other.updatedAt == updatedAt) &&
             (identical(other.user, user) || other.user == user) &&
             const DeepCollectionEquality().equals(other.custom, custom));
   }
@@ -81,7 +86,8 @@ abstract mixin class $FeedsReactionDataCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$FeedsReactionDataCopyWithImpl<$Res> implements $FeedsReactionDataCopyWith<$Res> {
+class _$FeedsReactionDataCopyWithImpl<$Res>
+    implements $FeedsReactionDataCopyWith<$Res> {
   _$FeedsReactionDataCopyWithImpl(this._self, this._then);
 
   final FeedsReactionData _self;
diff --git a/packages/stream_feeds/lib/src/models/file_upload_config_data.freezed.dart b/packages/stream_feeds/lib/src/models/file_upload_config_data.freezed.dart
index b85aef57..4bacf32b 100644
--- a/packages/stream_feeds/lib/src/models/file_upload_config_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/file_upload_config_data.freezed.dart
@@ -50,7 +50,8 @@ mixin _$FileUploadConfigData {
               other.blockedMimeTypes,
               blockedMimeTypes,
             ) &&
-            (identical(other.sizeLimit, sizeLimit) || other.sizeLimit == sizeLimit));
+            (identical(other.sizeLimit, sizeLimit) ||
+                other.sizeLimit == sizeLimit));
   }
 
   @override
@@ -86,7 +87,8 @@ abstract mixin class $FileUploadConfigDataCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$FileUploadConfigDataCopyWithImpl<$Res> implements $FileUploadConfigDataCopyWith<$Res> {
+class _$FileUploadConfigDataCopyWithImpl<$Res>
+    implements $FileUploadConfigDataCopyWith<$Res> {
   _$FileUploadConfigDataCopyWithImpl(this._self, this._then);
 
   final FileUploadConfigData _self;
diff --git a/packages/stream_feeds/lib/src/models/follow_data.freezed.dart b/packages/stream_feeds/lib/src/models/follow_data.freezed.dart
index bb9365c3..ebf5208f 100644
--- a/packages/stream_feeds/lib/src/models/follow_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/follow_data.freezed.dart
@@ -28,22 +28,31 @@ mixin _$FollowData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $FollowDataCopyWith<FollowData> get copyWith => _$FollowDataCopyWithImpl<FollowData>(this as FollowData, _$identity);
+  $FollowDataCopyWith<FollowData> get copyWith =>
+      _$FollowDataCopyWithImpl<FollowData>(this as FollowData, _$identity);
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is FollowData &&
-            (identical(other.createdAt, createdAt) || other.createdAt == createdAt) &&
-            (identical(other.followerRole, followerRole) || other.followerRole == followerRole) &&
-            (identical(other.pushPreference, pushPreference) || other.pushPreference == pushPreference) &&
-            (identical(other.requestAcceptedAt, requestAcceptedAt) || other.requestAcceptedAt == requestAcceptedAt) &&
-            (identical(other.requestRejectedAt, requestRejectedAt) || other.requestRejectedAt == requestRejectedAt) &&
-            (identical(other.sourceFeed, sourceFeed) || other.sourceFeed == sourceFeed) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
+            (identical(other.followerRole, followerRole) ||
+                other.followerRole == followerRole) &&
+            (identical(other.pushPreference, pushPreference) ||
+                other.pushPreference == pushPreference) &&
+            (identical(other.requestAcceptedAt, requestAcceptedAt) ||
+                other.requestAcceptedAt == requestAcceptedAt) &&
+            (identical(other.requestRejectedAt, requestRejectedAt) ||
+                other.requestRejectedAt == requestRejectedAt) &&
+            (identical(other.sourceFeed, sourceFeed) ||
+                other.sourceFeed == sourceFeed) &&
             (identical(other.status, status) || other.status == status) &&
-            (identical(other.targetFeed, targetFeed) || other.targetFeed == targetFeed) &&
-            (identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt) &&
+            (identical(other.targetFeed, targetFeed) ||
+                other.targetFeed == targetFeed) &&
+            (identical(other.updatedAt, updatedAt) ||
+                other.updatedAt == updatedAt) &&
             const DeepCollectionEquality().equals(other.custom, custom));
   }
 
diff --git a/packages/stream_feeds/lib/src/models/get_or_create_feed_data.freezed.dart b/packages/stream_feeds/lib/src/models/get_or_create_feed_data.freezed.dart
index 99fc4838..53943c11 100644
--- a/packages/stream_feeds/lib/src/models/get_or_create_feed_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/get_or_create_feed_data.freezed.dart
@@ -39,7 +39,8 @@ mixin _$GetOrCreateFeedData {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is GetOrCreateFeedData &&
-            (identical(other.pagination, pagination) || other.pagination == pagination) &&
+            (identical(other.pagination, pagination) ||
+                other.pagination == pagination) &&
             const DeepCollectionEquality().equals(
               other.activities,
               activities,
@@ -107,7 +108,8 @@ abstract mixin class $GetOrCreateFeedDataCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$GetOrCreateFeedDataCopyWithImpl<$Res> implements $GetOrCreateFeedDataCopyWith<$Res> {
+class _$GetOrCreateFeedDataCopyWithImpl<$Res>
+    implements $GetOrCreateFeedDataCopyWith<$Res> {
   _$GetOrCreateFeedDataCopyWithImpl(this._self, this._then);
 
   final GetOrCreateFeedData _self;
diff --git a/packages/stream_feeds/lib/src/models/mark_activity_data.freezed.dart b/packages/stream_feeds/lib/src/models/mark_activity_data.freezed.dart
index 9049b217..1ad9b1f0 100644
--- a/packages/stream_feeds/lib/src/models/mark_activity_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/mark_activity_data.freezed.dart
@@ -24,10 +24,11 @@ mixin _$MarkActivityData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $MarkActivityDataCopyWith<MarkActivityData> get copyWith => _$MarkActivityDataCopyWithImpl<MarkActivityData>(
-    this as MarkActivityData,
-    _$identity,
-  );
+  $MarkActivityDataCopyWith<MarkActivityData> get copyWith =>
+      _$MarkActivityDataCopyWithImpl<MarkActivityData>(
+        this as MarkActivityData,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -35,8 +36,10 @@ mixin _$MarkActivityData {
         (other.runtimeType == runtimeType &&
             other is MarkActivityData &&
             (identical(other.fid, fid) || other.fid == fid) &&
-            (identical(other.markAllRead, markAllRead) || other.markAllRead == markAllRead) &&
-            (identical(other.markAllSeen, markAllSeen) || other.markAllSeen == markAllSeen) &&
+            (identical(other.markAllRead, markAllRead) ||
+                other.markAllRead == markAllRead) &&
+            (identical(other.markAllSeen, markAllSeen) ||
+                other.markAllSeen == markAllSeen) &&
             const DeepCollectionEquality().equals(other.markRead, markRead) &&
             const DeepCollectionEquality().equals(other.markSeen, markSeen) &&
             const DeepCollectionEquality().equals(
@@ -80,7 +83,8 @@ abstract mixin class $MarkActivityDataCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$MarkActivityDataCopyWithImpl<$Res> implements $MarkActivityDataCopyWith<$Res> {
+class _$MarkActivityDataCopyWithImpl<$Res>
+    implements $MarkActivityDataCopyWith<$Res> {
   _$MarkActivityDataCopyWithImpl(this._self, this._then);
 
   final MarkActivityData _self;
diff --git a/packages/stream_feeds/lib/src/models/model_updates.freezed.dart b/packages/stream_feeds/lib/src/models/model_updates.freezed.dart
index 41ee82a5..391422e2 100644
--- a/packages/stream_feeds/lib/src/models/model_updates.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/model_updates.freezed.dart
@@ -21,10 +21,11 @@ mixin _$ModelUpdates<T> {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $ModelUpdatesCopyWith<T, ModelUpdates<T>> get copyWith => _$ModelUpdatesCopyWithImpl<T, ModelUpdates<T>>(
-    this as ModelUpdates<T>,
-    _$identity,
-  );
+  $ModelUpdatesCopyWith<T, ModelUpdates<T>> get copyWith =>
+      _$ModelUpdatesCopyWithImpl<T, ModelUpdates<T>>(
+        this as ModelUpdates<T>,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -64,7 +65,8 @@ abstract mixin class $ModelUpdatesCopyWith<T, $Res> {
 }
 
 /// @nodoc
-class _$ModelUpdatesCopyWithImpl<T, $Res> implements $ModelUpdatesCopyWith<T, $Res> {
+class _$ModelUpdatesCopyWithImpl<T, $Res>
+    implements $ModelUpdatesCopyWith<T, $Res> {
   _$ModelUpdatesCopyWithImpl(this._self, this._then);
 
   final ModelUpdates<T> _self;
diff --git a/packages/stream_feeds/lib/src/models/moderation.freezed.dart b/packages/stream_feeds/lib/src/models/moderation.freezed.dart
index f5ee0ec4..1d8ef3db 100644
--- a/packages/stream_feeds/lib/src/models/moderation.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/moderation.freezed.dart
@@ -25,7 +25,8 @@ mixin _$Moderation {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $ModerationCopyWith<Moderation> get copyWith => _$ModerationCopyWithImpl<Moderation>(this as Moderation, _$identity);
+  $ModerationCopyWith<Moderation> get copyWith =>
+      _$ModerationCopyWithImpl<Moderation>(this as Moderation, _$identity);
 
   @override
   bool operator ==(Object other) {
@@ -33,12 +34,14 @@ mixin _$Moderation {
         (other.runtimeType == runtimeType &&
             other is Moderation &&
             (identical(other.action, action) || other.action == action) &&
-            (identical(other.blocklistMatched, blocklistMatched) || other.blocklistMatched == blocklistMatched) &&
+            (identical(other.blocklistMatched, blocklistMatched) ||
+                other.blocklistMatched == blocklistMatched) &&
             const DeepCollectionEquality().equals(
               other.imageHarms,
               imageHarms,
             ) &&
-            (identical(other.originalText, originalText) || other.originalText == originalText) &&
+            (identical(other.originalText, originalText) ||
+                other.originalText == originalText) &&
             (identical(other.platformCircumvented, platformCircumvented) ||
                 other.platformCircumvented == platformCircumvented) &&
             (identical(other.semanticFilterMatched, semanticFilterMatched) ||
diff --git a/packages/stream_feeds/lib/src/models/moderation_config_data.freezed.dart b/packages/stream_feeds/lib/src/models/moderation_config_data.freezed.dart
index 92e9470e..7891b8ec 100644
--- a/packages/stream_feeds/lib/src/models/moderation_config_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/moderation_config_data.freezed.dart
@@ -42,27 +42,35 @@ mixin _$ModerationConfigData {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is ModerationConfigData &&
-            (identical(other.aiImageConfig, aiImageConfig) || other.aiImageConfig == aiImageConfig) &&
-            (identical(other.aiTextConfig, aiTextConfig) || other.aiTextConfig == aiTextConfig) &&
-            (identical(other.aiVideoConfig, aiVideoConfig) || other.aiVideoConfig == aiVideoConfig) &&
+            (identical(other.aiImageConfig, aiImageConfig) ||
+                other.aiImageConfig == aiImageConfig) &&
+            (identical(other.aiTextConfig, aiTextConfig) ||
+                other.aiTextConfig == aiTextConfig) &&
+            (identical(other.aiVideoConfig, aiVideoConfig) ||
+                other.aiVideoConfig == aiVideoConfig) &&
             (identical(other.async, async) || other.async == async) &&
             (identical(
                   other.automodPlatformCircumventionConfig,
                   automodPlatformCircumventionConfig,
                 ) ||
-                other.automodPlatformCircumventionConfig == automodPlatformCircumventionConfig) &&
+                other.automodPlatformCircumventionConfig ==
+                    automodPlatformCircumventionConfig) &&
             (identical(
                   other.automodSemanticFiltersConfig,
                   automodSemanticFiltersConfig,
                 ) ||
-                other.automodSemanticFiltersConfig == automodSemanticFiltersConfig) &&
+                other.automodSemanticFiltersConfig ==
+                    automodSemanticFiltersConfig) &&
             (identical(other.automodToxicityConfig, automodToxicityConfig) ||
                 other.automodToxicityConfig == automodToxicityConfig) &&
-            (identical(other.blockListConfig, blockListConfig) || other.blockListConfig == blockListConfig) &&
-            (identical(other.createdAt, createdAt) || other.createdAt == createdAt) &&
+            (identical(other.blockListConfig, blockListConfig) ||
+                other.blockListConfig == blockListConfig) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
             (identical(other.key, key) || other.key == key) &&
             (identical(other.team, team) || other.team == team) &&
-            (identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt) &&
+            (identical(other.updatedAt, updatedAt) ||
+                other.updatedAt == updatedAt) &&
             (identical(other.velocityFilterConfig, velocityFilterConfig) ||
                 other.velocityFilterConfig == velocityFilterConfig));
   }
@@ -116,7 +124,8 @@ abstract mixin class $ModerationConfigDataCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$ModerationConfigDataCopyWithImpl<$Res> implements $ModerationConfigDataCopyWith<$Res> {
+class _$ModerationConfigDataCopyWithImpl<$Res>
+    implements $ModerationConfigDataCopyWith<$Res> {
   _$ModerationConfigDataCopyWithImpl(this._self, this._then);
 
   final ModerationConfigData _self;
@@ -159,7 +168,8 @@ class _$ModerationConfigDataCopyWithImpl<$Res> implements $ModerationConfigDataC
             ? _self.async
             : async // ignore: cast_nullable_to_non_nullable
                   as bool,
-        automodPlatformCircumventionConfig: freezed == automodPlatformCircumventionConfig
+        automodPlatformCircumventionConfig:
+            freezed == automodPlatformCircumventionConfig
             ? _self.automodPlatformCircumventionConfig
             : automodPlatformCircumventionConfig // ignore: cast_nullable_to_non_nullable
                   as AutomodPlatformCircumventionConfig?,
diff --git a/packages/stream_feeds/lib/src/models/pagination_data.freezed.dart b/packages/stream_feeds/lib/src/models/pagination_data.freezed.dart
index 0072a0fb..8ba9c6ff 100644
--- a/packages/stream_feeds/lib/src/models/pagination_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/pagination_data.freezed.dart
@@ -20,10 +20,11 @@ mixin _$PaginationData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $PaginationDataCopyWith<PaginationData> get copyWith => _$PaginationDataCopyWithImpl<PaginationData>(
-    this as PaginationData,
-    _$identity,
-  );
+  $PaginationDataCopyWith<PaginationData> get copyWith =>
+      _$PaginationDataCopyWithImpl<PaginationData>(
+        this as PaginationData,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -31,7 +32,8 @@ mixin _$PaginationData {
         (other.runtimeType == runtimeType &&
             other is PaginationData &&
             (identical(other.next, next) || other.next == next) &&
-            (identical(other.previous, previous) || other.previous == previous));
+            (identical(other.previous, previous) ||
+                other.previous == previous));
   }
 
   @override
@@ -54,7 +56,8 @@ abstract mixin class $PaginationDataCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$PaginationDataCopyWithImpl<$Res> implements $PaginationDataCopyWith<$Res> {
+class _$PaginationDataCopyWithImpl<$Res>
+    implements $PaginationDataCopyWith<$Res> {
   _$PaginationDataCopyWithImpl(this._self, this._then);
 
   final PaginationData _self;
@@ -101,7 +104,8 @@ mixin _$PaginationResult<T> {
         (other.runtimeType == runtimeType &&
             other is PaginationResult<T> &&
             const DeepCollectionEquality().equals(other.items, items) &&
-            (identical(other.pagination, pagination) || other.pagination == pagination));
+            (identical(other.pagination, pagination) ||
+                other.pagination == pagination));
   }
 
   @override
@@ -128,7 +132,8 @@ abstract mixin class $PaginationResultCopyWith<T, $Res> {
 }
 
 /// @nodoc
-class _$PaginationResultCopyWithImpl<T, $Res> implements $PaginationResultCopyWith<T, $Res> {
+class _$PaginationResultCopyWithImpl<T, $Res>
+    implements $PaginationResultCopyWith<T, $Res> {
   _$PaginationResultCopyWithImpl(this._self, this._then);
 
   final PaginationResult<T> _self;
diff --git a/packages/stream_feeds/lib/src/models/poll_data.freezed.dart b/packages/stream_feeds/lib/src/models/poll_data.freezed.dart
index 2b468dae..26b3f47c 100644
--- a/packages/stream_feeds/lib/src/models/poll_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/poll_data.freezed.dart
@@ -39,27 +39,36 @@ mixin _$PollData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $PollDataCopyWith<PollData> get copyWith => _$PollDataCopyWithImpl<PollData>(this as PollData, _$identity);
+  $PollDataCopyWith<PollData> get copyWith =>
+      _$PollDataCopyWithImpl<PollData>(this as PollData, _$identity);
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is PollData &&
-            (identical(other.allowAnswers, allowAnswers) || other.allowAnswers == allowAnswers) &&
+            (identical(other.allowAnswers, allowAnswers) ||
+                other.allowAnswers == allowAnswers) &&
             (identical(
                   other.allowUserSuggestedOptions,
                   allowUserSuggestedOptions,
                 ) ||
                 other.allowUserSuggestedOptions == allowUserSuggestedOptions) &&
-            (identical(other.answersCount, answersCount) || other.answersCount == answersCount) &&
-            (identical(other.createdAt, createdAt) || other.createdAt == createdAt) &&
-            (identical(other.createdBy, createdBy) || other.createdBy == createdBy) &&
-            (identical(other.createdById, createdById) || other.createdById == createdById) &&
-            (identical(other.description, description) || other.description == description) &&
-            (identical(other.enforceUniqueVote, enforceUniqueVote) || other.enforceUniqueVote == enforceUniqueVote) &&
+            (identical(other.answersCount, answersCount) ||
+                other.answersCount == answersCount) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
+            (identical(other.createdBy, createdBy) ||
+                other.createdBy == createdBy) &&
+            (identical(other.createdById, createdById) ||
+                other.createdById == createdById) &&
+            (identical(other.description, description) ||
+                other.description == description) &&
+            (identical(other.enforceUniqueVote, enforceUniqueVote) ||
+                other.enforceUniqueVote == enforceUniqueVote) &&
             (identical(other.id, id) || other.id == id) &&
-            (identical(other.isClosed, isClosed) || other.isClosed == isClosed) &&
+            (identical(other.isClosed, isClosed) ||
+                other.isClosed == isClosed) &&
             const DeepCollectionEquality().equals(
               other.latestAnswers,
               latestAnswers,
@@ -68,20 +77,24 @@ mixin _$PollData {
               other.latestVotesByOption,
               latestVotesByOption,
             ) &&
-            (identical(other.maxVotesAllowed, maxVotesAllowed) || other.maxVotesAllowed == maxVotesAllowed) &&
+            (identical(other.maxVotesAllowed, maxVotesAllowed) ||
+                other.maxVotesAllowed == maxVotesAllowed) &&
             (identical(other.name, name) || other.name == name) &&
             const DeepCollectionEquality().equals(other.options, options) &&
             const DeepCollectionEquality().equals(
               other.ownVotesAndAnswers,
               ownVotesAndAnswers,
             ) &&
-            (identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt) &&
-            (identical(other.voteCount, voteCount) || other.voteCount == voteCount) &&
+            (identical(other.updatedAt, updatedAt) ||
+                other.updatedAt == updatedAt) &&
+            (identical(other.voteCount, voteCount) ||
+                other.voteCount == voteCount) &&
             const DeepCollectionEquality().equals(
               other.voteCountsByOption,
               voteCountsByOption,
             ) &&
-            (identical(other.votingVisibility, votingVisibility) || other.votingVisibility == votingVisibility) &&
+            (identical(other.votingVisibility, votingVisibility) ||
+                other.votingVisibility == votingVisibility) &&
             const DeepCollectionEquality().equals(other.custom, custom));
   }
 
@@ -119,7 +132,8 @@ mixin _$PollData {
 
 /// @nodoc
 abstract mixin class $PollDataCopyWith<$Res> {
-  factory $PollDataCopyWith(PollData value, $Res Function(PollData) _then) = _$PollDataCopyWithImpl;
+  factory $PollDataCopyWith(PollData value, $Res Function(PollData) _then) =
+      _$PollDataCopyWithImpl;
   @useResult
   $Res call({
     bool allowAnswers,
diff --git a/packages/stream_feeds/lib/src/models/poll_option_data.freezed.dart b/packages/stream_feeds/lib/src/models/poll_option_data.freezed.dart
index ff37e35d..51dd7ead 100644
--- a/packages/stream_feeds/lib/src/models/poll_option_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/poll_option_data.freezed.dart
@@ -21,10 +21,11 @@ mixin _$PollOptionData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $PollOptionDataCopyWith<PollOptionData> get copyWith => _$PollOptionDataCopyWithImpl<PollOptionData>(
-    this as PollOptionData,
-    _$identity,
-  );
+  $PollOptionDataCopyWith<PollOptionData> get copyWith =>
+      _$PollOptionDataCopyWithImpl<PollOptionData>(
+        this as PollOptionData,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -61,7 +62,8 @@ abstract mixin class $PollOptionDataCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$PollOptionDataCopyWithImpl<$Res> implements $PollOptionDataCopyWith<$Res> {
+class _$PollOptionDataCopyWithImpl<$Res>
+    implements $PollOptionDataCopyWith<$Res> {
   _$PollOptionDataCopyWithImpl(this._self, this._then);
 
   final PollOptionData _self;
diff --git a/packages/stream_feeds/lib/src/models/poll_vote_data.freezed.dart b/packages/stream_feeds/lib/src/models/poll_vote_data.freezed.dart
index 2805eff8..c0b846eb 100644
--- a/packages/stream_feeds/lib/src/models/poll_vote_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/poll_vote_data.freezed.dart
@@ -26,22 +26,27 @@ mixin _$PollVoteData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $PollVoteDataCopyWith<PollVoteData> get copyWith => _$PollVoteDataCopyWithImpl<PollVoteData>(
-    this as PollVoteData,
-    _$identity,
-  );
+  $PollVoteDataCopyWith<PollVoteData> get copyWith =>
+      _$PollVoteDataCopyWithImpl<PollVoteData>(
+        this as PollVoteData,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is PollVoteData &&
-            (identical(other.answerText, answerText) || other.answerText == answerText) &&
-            (identical(other.createdAt, createdAt) || other.createdAt == createdAt) &&
+            (identical(other.answerText, answerText) ||
+                other.answerText == answerText) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
             (identical(other.id, id) || other.id == id) &&
-            (identical(other.optionId, optionId) || other.optionId == optionId) &&
+            (identical(other.optionId, optionId) ||
+                other.optionId == optionId) &&
             (identical(other.pollId, pollId) || other.pollId == pollId) &&
-            (identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt) &&
+            (identical(other.updatedAt, updatedAt) ||
+                other.updatedAt == updatedAt) &&
             (identical(other.user, user) || other.user == user) &&
             (identical(other.userId, userId) || other.userId == userId));
   }
diff --git a/packages/stream_feeds/lib/src/models/push_notifications_config.freezed.dart b/packages/stream_feeds/lib/src/models/push_notifications_config.freezed.dart
index b30bcb14..8fec7e3f 100644
--- a/packages/stream_feeds/lib/src/models/push_notifications_config.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/push_notifications_config.freezed.dart
@@ -30,7 +30,8 @@ mixin _$PushNotificationsConfig {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is PushNotificationsConfig &&
-            (identical(other.pushProviderInfo, pushProviderInfo) || other.pushProviderInfo == pushProviderInfo));
+            (identical(other.pushProviderInfo, pushProviderInfo) ||
+                other.pushProviderInfo == pushProviderInfo));
   }
 
   @override
@@ -53,7 +54,8 @@ abstract mixin class $PushNotificationsConfigCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$PushNotificationsConfigCopyWithImpl<$Res> implements $PushNotificationsConfigCopyWith<$Res> {
+class _$PushNotificationsConfigCopyWithImpl<$Res>
+    implements $PushNotificationsConfigCopyWith<$Res> {
   _$PushNotificationsConfigCopyWithImpl(this._self, this._then);
 
   final PushNotificationsConfig _self;
@@ -84,10 +86,11 @@ mixin _$PushProviderInfo {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $PushProviderInfoCopyWith<PushProviderInfo> get copyWith => _$PushProviderInfoCopyWithImpl<PushProviderInfo>(
-    this as PushProviderInfo,
-    _$identity,
-  );
+  $PushProviderInfoCopyWith<PushProviderInfo> get copyWith =>
+      _$PushProviderInfoCopyWithImpl<PushProviderInfo>(
+        this as PushProviderInfo,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -95,7 +98,8 @@ mixin _$PushProviderInfo {
         (other.runtimeType == runtimeType &&
             other is PushProviderInfo &&
             (identical(other.name, name) || other.name == name) &&
-            (identical(other.pushProvider, pushProvider) || other.pushProvider == pushProvider));
+            (identical(other.pushProvider, pushProvider) ||
+                other.pushProvider == pushProvider));
   }
 
   @override
@@ -118,7 +122,8 @@ abstract mixin class $PushProviderInfoCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$PushProviderInfoCopyWithImpl<$Res> implements $PushProviderInfoCopyWith<$Res> {
+class _$PushProviderInfoCopyWithImpl<$Res>
+    implements $PushProviderInfoCopyWith<$Res> {
   _$PushProviderInfoCopyWithImpl(this._self, this._then);
 
   final PushProviderInfo _self;
diff --git a/packages/stream_feeds/lib/src/models/query_configuration.freezed.dart b/packages/stream_feeds/lib/src/models/query_configuration.freezed.dart
index 810ab05e..a5b46b69 100644
--- a/packages/stream_feeds/lib/src/models/query_configuration.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/query_configuration.freezed.dart
@@ -59,7 +59,8 @@ abstract mixin class $QueryConfigurationCopyWith<T extends Object, $Res> {
 }
 
 /// @nodoc
-class _$QueryConfigurationCopyWithImpl<T extends Object, $Res> implements $QueryConfigurationCopyWith<T, $Res> {
+class _$QueryConfigurationCopyWithImpl<T extends Object, $Res>
+    implements $QueryConfigurationCopyWith<T, $Res> {
   _$QueryConfigurationCopyWithImpl(this._self, this._then);
 
   final QueryConfiguration<T> _self;
diff --git a/packages/stream_feeds/lib/src/models/reaction_group_data.freezed.dart b/packages/stream_feeds/lib/src/models/reaction_group_data.freezed.dart
index 599c47bd..56a661c9 100644
--- a/packages/stream_feeds/lib/src/models/reaction_group_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/reaction_group_data.freezed.dart
@@ -21,10 +21,11 @@ mixin _$ReactionGroupData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $ReactionGroupDataCopyWith<ReactionGroupData> get copyWith => _$ReactionGroupDataCopyWithImpl<ReactionGroupData>(
-    this as ReactionGroupData,
-    _$identity,
-  );
+  $ReactionGroupDataCopyWith<ReactionGroupData> get copyWith =>
+      _$ReactionGroupDataCopyWithImpl<ReactionGroupData>(
+        this as ReactionGroupData,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -32,12 +33,15 @@ mixin _$ReactionGroupData {
         (other.runtimeType == runtimeType &&
             other is ReactionGroupData &&
             (identical(other.count, count) || other.count == count) &&
-            (identical(other.firstReactionAt, firstReactionAt) || other.firstReactionAt == firstReactionAt) &&
-            (identical(other.lastReactionAt, lastReactionAt) || other.lastReactionAt == lastReactionAt));
+            (identical(other.firstReactionAt, firstReactionAt) ||
+                other.firstReactionAt == firstReactionAt) &&
+            (identical(other.lastReactionAt, lastReactionAt) ||
+                other.lastReactionAt == lastReactionAt));
   }
 
   @override
-  int get hashCode => Object.hash(runtimeType, count, firstReactionAt, lastReactionAt);
+  int get hashCode =>
+      Object.hash(runtimeType, count, firstReactionAt, lastReactionAt);
 
   @override
   String toString() {
@@ -56,7 +60,8 @@ abstract mixin class $ReactionGroupDataCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$ReactionGroupDataCopyWithImpl<$Res> implements $ReactionGroupDataCopyWith<$Res> {
+class _$ReactionGroupDataCopyWithImpl<$Res>
+    implements $ReactionGroupDataCopyWith<$Res> {
   _$ReactionGroupDataCopyWithImpl(this._self, this._then);
 
   final ReactionGroupData _self;
diff --git a/packages/stream_feeds/lib/src/models/request/activity_add_comment_request.freezed.dart b/packages/stream_feeds/lib/src/models/request/activity_add_comment_request.freezed.dart
index 7fe34bfd..ab1bdfd6 100644
--- a/packages/stream_feeds/lib/src/models/request/activity_add_comment_request.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/request/activity_add_comment_request.freezed.dart
@@ -38,8 +38,10 @@ mixin _$ActivityAddCommentRequest {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is ActivityAddCommentRequest &&
-            (identical(other.activityId, activityId) || other.activityId == activityId) &&
-            (identical(other.activityType, activityType) || other.activityType == activityType) &&
+            (identical(other.activityId, activityId) ||
+                other.activityId == activityId) &&
+            (identical(other.activityType, activityType) ||
+                other.activityType == activityType) &&
             const DeepCollectionEquality().equals(
               other.attachments,
               attachments,
@@ -53,12 +55,14 @@ mixin _$ActivityAddCommentRequest {
                   other.createNotificationActivity,
                   createNotificationActivity,
                 ) ||
-                other.createNotificationActivity == createNotificationActivity) &&
+                other.createNotificationActivity ==
+                    createNotificationActivity) &&
             const DeepCollectionEquality().equals(
               other.mentionedUserIds,
               mentionedUserIds,
             ) &&
-            (identical(other.parentId, parentId) || other.parentId == parentId) &&
+            (identical(other.parentId, parentId) ||
+                other.parentId == parentId) &&
             const DeepCollectionEquality().equals(other.custom, custom));
   }
 
@@ -103,7 +107,8 @@ abstract mixin class $ActivityAddCommentRequestCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$ActivityAddCommentRequestCopyWithImpl<$Res> implements $ActivityAddCommentRequestCopyWith<$Res> {
+class _$ActivityAddCommentRequestCopyWithImpl<$Res>
+    implements $ActivityAddCommentRequestCopyWith<$Res> {
   _$ActivityAddCommentRequestCopyWithImpl(this._self, this._then);
 
   final ActivityAddCommentRequest _self;
diff --git a/packages/stream_feeds/lib/src/models/request/activity_update_comment_request.freezed.dart b/packages/stream_feeds/lib/src/models/request/activity_update_comment_request.freezed.dart
index 7fa9f91d..f3dc027d 100644
--- a/packages/stream_feeds/lib/src/models/request/activity_update_comment_request.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/request/activity_update_comment_request.freezed.dart
@@ -21,7 +21,8 @@ mixin _$ActivityUpdateCommentRequest {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $ActivityUpdateCommentRequestCopyWith<ActivityUpdateCommentRequest> get copyWith =>
+  $ActivityUpdateCommentRequestCopyWith<ActivityUpdateCommentRequest>
+  get copyWith =>
       _$ActivityUpdateCommentRequestCopyWithImpl<ActivityUpdateCommentRequest>(
         this as ActivityUpdateCommentRequest,
         _$identity,
@@ -34,7 +35,8 @@ mixin _$ActivityUpdateCommentRequest {
             other is ActivityUpdateCommentRequest &&
             (identical(other.comment, comment) || other.comment == comment) &&
             const DeepCollectionEquality().equals(other.custom, custom) &&
-            (identical(other.skipPush, skipPush) || other.skipPush == skipPush));
+            (identical(other.skipPush, skipPush) ||
+                other.skipPush == skipPush));
   }
 
   @override
@@ -62,7 +64,8 @@ abstract mixin class $ActivityUpdateCommentRequestCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$ActivityUpdateCommentRequestCopyWithImpl<$Res> implements $ActivityUpdateCommentRequestCopyWith<$Res> {
+class _$ActivityUpdateCommentRequestCopyWithImpl<$Res>
+    implements $ActivityUpdateCommentRequestCopyWith<$Res> {
   _$ActivityUpdateCommentRequestCopyWithImpl(this._self, this._then);
 
   final ActivityUpdateCommentRequest _self;
diff --git a/packages/stream_feeds/lib/src/models/request/feed_add_activity_request.freezed.dart b/packages/stream_feeds/lib/src/models/request/feed_add_activity_request.freezed.dart
index e41cd78b..d000e9e7 100644
--- a/packages/stream_feeds/lib/src/models/request/feed_add_activity_request.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/request/feed_add_activity_request.freezed.dart
@@ -66,10 +66,13 @@ mixin _$FeedAddActivityRequest {
                   other.createNotificationActivity,
                   createNotificationActivity,
                 ) ||
-                other.createNotificationActivity == createNotificationActivity) &&
+                other.createNotificationActivity ==
+                    createNotificationActivity) &&
             const DeepCollectionEquality().equals(other.custom, custom) &&
-            (identical(other.enrichOwnFields, enrichOwnFields) || other.enrichOwnFields == enrichOwnFields) &&
-            (identical(other.expiresAt, expiresAt) || other.expiresAt == expiresAt) &&
+            (identical(other.enrichOwnFields, enrichOwnFields) ||
+                other.enrichOwnFields == enrichOwnFields) &&
+            (identical(other.expiresAt, expiresAt) ||
+                other.expiresAt == expiresAt) &&
             const DeepCollectionEquality().equals(other.feeds, feeds) &&
             const DeepCollectionEquality().equals(
               other.filterTags,
@@ -80,22 +83,27 @@ mixin _$FeedAddActivityRequest {
               other.interestTags,
               interestTags,
             ) &&
-            (identical(other.location, location) || other.location == location) &&
+            (identical(other.location, location) ||
+                other.location == location) &&
             const DeepCollectionEquality().equals(
               other.mentionedUserIds,
               mentionedUserIds,
             ) &&
-            (identical(other.parentId, parentId) || other.parentId == parentId) &&
+            (identical(other.parentId, parentId) ||
+                other.parentId == parentId) &&
             (identical(other.pollId, pollId) || other.pollId == pollId) &&
             const DeepCollectionEquality().equals(
               other.searchData,
               searchData,
             ) &&
-            (identical(other.skipPush, skipPush) || other.skipPush == skipPush) &&
+            (identical(other.skipPush, skipPush) ||
+                other.skipPush == skipPush) &&
             (identical(other.text, text) || other.text == text) &&
             (identical(other.type, type) || other.type == type) &&
-            (identical(other.visibility, visibility) || other.visibility == visibility) &&
-            (identical(other.visibilityTag, visibilityTag) || other.visibilityTag == visibilityTag));
+            (identical(other.visibility, visibility) ||
+                other.visibility == visibility) &&
+            (identical(other.visibilityTag, visibilityTag) ||
+                other.visibilityTag == visibilityTag));
   }
 
   @override
@@ -163,7 +171,8 @@ abstract mixin class $FeedAddActivityRequestCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$FeedAddActivityRequestCopyWithImpl<$Res> implements $FeedAddActivityRequestCopyWith<$Res> {
+class _$FeedAddActivityRequestCopyWithImpl<$Res>
+    implements $FeedAddActivityRequestCopyWith<$Res> {
   _$FeedAddActivityRequestCopyWithImpl(this._self, this._then);
 
   final FeedAddActivityRequest _self;
diff --git a/packages/stream_feeds/lib/src/models/user_data.freezed.dart b/packages/stream_feeds/lib/src/models/user_data.freezed.dart
index 89463c94..473bfd2a 100644
--- a/packages/stream_feeds/lib/src/models/user_data.freezed.dart
+++ b/packages/stream_feeds/lib/src/models/user_data.freezed.dart
@@ -34,7 +34,8 @@ mixin _$UserData {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $UserDataCopyWith<UserData> get copyWith => _$UserDataCopyWithImpl<UserData>(this as UserData, _$identity);
+  $UserDataCopyWith<UserData> get copyWith =>
+      _$UserDataCopyWithImpl<UserData>(this as UserData, _$identity);
 
   @override
   bool operator ==(Object other) {
@@ -46,13 +47,18 @@ mixin _$UserData {
               other.blockedUserIds,
               blockedUserIds,
             ) &&
-            (identical(other.createdAt, createdAt) || other.createdAt == createdAt) &&
-            (identical(other.deactivatedAt, deactivatedAt) || other.deactivatedAt == deactivatedAt) &&
-            (identical(other.deletedAt, deletedAt) || other.deletedAt == deletedAt) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
+            (identical(other.deactivatedAt, deactivatedAt) ||
+                other.deactivatedAt == deactivatedAt) &&
+            (identical(other.deletedAt, deletedAt) ||
+                other.deletedAt == deletedAt) &&
             (identical(other.id, id) || other.id == id) &&
             (identical(other.image, image) || other.image == image) &&
-            (identical(other.language, language) || other.language == language) &&
-            (identical(other.lastActive, lastActive) || other.lastActive == lastActive) &&
+            (identical(other.language, language) ||
+                other.language == language) &&
+            (identical(other.lastActive, lastActive) ||
+                other.lastActive == lastActive) &&
             (identical(other.name, name) || other.name == name) &&
             (identical(other.online, online) || other.online == online) &&
             (identical(
@@ -62,7 +68,8 @@ mixin _$UserData {
                 other.revokeTokensIssuedBefore == revokeTokensIssuedBefore) &&
             (identical(other.role, role) || other.role == role) &&
             const DeepCollectionEquality().equals(other.teams, teams) &&
-            (identical(other.updatedAt, updatedAt) || other.updatedAt == updatedAt) &&
+            (identical(other.updatedAt, updatedAt) ||
+                other.updatedAt == updatedAt) &&
             const DeepCollectionEquality().equals(other.custom, custom));
   }
 
@@ -95,7 +102,8 @@ mixin _$UserData {
 
 /// @nodoc
 abstract mixin class $UserDataCopyWith<$Res> {
-  factory $UserDataCopyWith(UserData value, $Res Function(UserData) _then) = _$UserDataCopyWithImpl;
+  factory $UserDataCopyWith(UserData value, $Res Function(UserData) _then) =
+      _$UserDataCopyWithImpl;
   @useResult
   $Res call({
     bool banned,
diff --git a/packages/stream_feeds/lib/src/state/activity_comment_list_state.freezed.dart b/packages/stream_feeds/lib/src/state/activity_comment_list_state.freezed.dart
index 98807312..f0d450e8 100644
--- a/packages/stream_feeds/lib/src/state/activity_comment_list_state.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/activity_comment_list_state.freezed.dart
@@ -32,7 +32,8 @@ mixin _$ActivityCommentListState {
         (other.runtimeType == runtimeType &&
             other is ActivityCommentListState &&
             const DeepCollectionEquality().equals(other.comments, comments) &&
-            (identical(other.pagination, pagination) || other.pagination == pagination));
+            (identical(other.pagination, pagination) ||
+                other.pagination == pagination));
   }
 
   @override
@@ -59,7 +60,8 @@ abstract mixin class $ActivityCommentListStateCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$ActivityCommentListStateCopyWithImpl<$Res> implements $ActivityCommentListStateCopyWith<$Res> {
+class _$ActivityCommentListStateCopyWithImpl<$Res>
+    implements $ActivityCommentListStateCopyWith<$Res> {
   _$ActivityCommentListStateCopyWithImpl(this._self, this._then);
 
   final ActivityCommentListState _self;
diff --git a/packages/stream_feeds/lib/src/state/activity_list_state.freezed.dart b/packages/stream_feeds/lib/src/state/activity_list_state.freezed.dart
index 506523e3..50d454fb 100644
--- a/packages/stream_feeds/lib/src/state/activity_list_state.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/activity_list_state.freezed.dart
@@ -20,10 +20,11 @@ mixin _$ActivityListState {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $ActivityListStateCopyWith<ActivityListState> get copyWith => _$ActivityListStateCopyWithImpl<ActivityListState>(
-    this as ActivityListState,
-    _$identity,
-  );
+  $ActivityListStateCopyWith<ActivityListState> get copyWith =>
+      _$ActivityListStateCopyWithImpl<ActivityListState>(
+        this as ActivityListState,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -34,7 +35,8 @@ mixin _$ActivityListState {
               other.activities,
               activities,
             ) &&
-            (identical(other.pagination, pagination) || other.pagination == pagination));
+            (identical(other.pagination, pagination) ||
+                other.pagination == pagination));
   }
 
   @override
@@ -61,7 +63,8 @@ abstract mixin class $ActivityListStateCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$ActivityListStateCopyWithImpl<$Res> implements $ActivityListStateCopyWith<$Res> {
+class _$ActivityListStateCopyWithImpl<$Res>
+    implements $ActivityListStateCopyWith<$Res> {
   _$ActivityListStateCopyWithImpl(this._self, this._then);
 
   final ActivityListState _self;
diff --git a/packages/stream_feeds/lib/src/state/activity_reaction_list_state.freezed.dart b/packages/stream_feeds/lib/src/state/activity_reaction_list_state.freezed.dart
index 328181a7..57b78012 100644
--- a/packages/stream_feeds/lib/src/state/activity_reaction_list_state.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/activity_reaction_list_state.freezed.dart
@@ -34,7 +34,8 @@ mixin _$ActivityReactionListState {
             other is ActivityReactionListState &&
             (identical(other.query, query) || other.query == query) &&
             const DeepCollectionEquality().equals(other.reactions, reactions) &&
-            (identical(other.pagination, pagination) || other.pagination == pagination));
+            (identical(other.pagination, pagination) ||
+                other.pagination == pagination));
   }
 
   @override
@@ -66,7 +67,8 @@ abstract mixin class $ActivityReactionListStateCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$ActivityReactionListStateCopyWithImpl<$Res> implements $ActivityReactionListStateCopyWith<$Res> {
+class _$ActivityReactionListStateCopyWithImpl<$Res>
+    implements $ActivityReactionListStateCopyWith<$Res> {
   _$ActivityReactionListStateCopyWithImpl(this._self, this._then);
 
   final ActivityReactionListState _self;
diff --git a/packages/stream_feeds/lib/src/state/activity_state.freezed.dart b/packages/stream_feeds/lib/src/state/activity_state.freezed.dart
index 6d0585b9..d122ff56 100644
--- a/packages/stream_feeds/lib/src/state/activity_state.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/activity_state.freezed.dart
@@ -21,17 +21,19 @@ mixin _$ActivityState {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $ActivityStateCopyWith<ActivityState> get copyWith => _$ActivityStateCopyWithImpl<ActivityState>(
-    this as ActivityState,
-    _$identity,
-  );
+  $ActivityStateCopyWith<ActivityState> get copyWith =>
+      _$ActivityStateCopyWithImpl<ActivityState>(
+        this as ActivityState,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is ActivityState &&
-            (identical(other.activity, activity) || other.activity == activity) &&
+            (identical(other.activity, activity) ||
+                other.activity == activity) &&
             const DeepCollectionEquality().equals(other.comments, comments) &&
             (identical(other.commentsPagination, commentsPagination) ||
                 other.commentsPagination == commentsPagination));
@@ -66,7 +68,8 @@ abstract mixin class $ActivityStateCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$ActivityStateCopyWithImpl<$Res> implements $ActivityStateCopyWith<$Res> {
+class _$ActivityStateCopyWithImpl<$Res>
+    implements $ActivityStateCopyWith<$Res> {
   _$ActivityStateCopyWithImpl(this._self, this._then);
 
   final ActivityState _self;
diff --git a/packages/stream_feeds/lib/src/state/bookmark_folder_list_state.freezed.dart b/packages/stream_feeds/lib/src/state/bookmark_folder_list_state.freezed.dart
index b6a0932d..39030933 100644
--- a/packages/stream_feeds/lib/src/state/bookmark_folder_list_state.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/bookmark_folder_list_state.freezed.dart
@@ -37,7 +37,8 @@ mixin _$BookmarkFolderListState {
               other.bookmarkFolders,
               bookmarkFolders,
             ) &&
-            (identical(other.pagination, pagination) || other.pagination == pagination));
+            (identical(other.pagination, pagination) ||
+                other.pagination == pagination));
   }
 
   @override
@@ -69,7 +70,8 @@ abstract mixin class $BookmarkFolderListStateCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$BookmarkFolderListStateCopyWithImpl<$Res> implements $BookmarkFolderListStateCopyWith<$Res> {
+class _$BookmarkFolderListStateCopyWithImpl<$Res>
+    implements $BookmarkFolderListStateCopyWith<$Res> {
   _$BookmarkFolderListStateCopyWithImpl(this._self, this._then);
 
   final BookmarkFolderListState _self;
diff --git a/packages/stream_feeds/lib/src/state/bookmark_list_state.freezed.dart b/packages/stream_feeds/lib/src/state/bookmark_list_state.freezed.dart
index 05d05d07..a61176e2 100644
--- a/packages/stream_feeds/lib/src/state/bookmark_list_state.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/bookmark_list_state.freezed.dart
@@ -20,10 +20,11 @@ mixin _$BookmarkListState {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $BookmarkListStateCopyWith<BookmarkListState> get copyWith => _$BookmarkListStateCopyWithImpl<BookmarkListState>(
-    this as BookmarkListState,
-    _$identity,
-  );
+  $BookmarkListStateCopyWith<BookmarkListState> get copyWith =>
+      _$BookmarkListStateCopyWithImpl<BookmarkListState>(
+        this as BookmarkListState,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -31,7 +32,8 @@ mixin _$BookmarkListState {
         (other.runtimeType == runtimeType &&
             other is BookmarkListState &&
             const DeepCollectionEquality().equals(other.bookmarks, bookmarks) &&
-            (identical(other.pagination, pagination) || other.pagination == pagination));
+            (identical(other.pagination, pagination) ||
+                other.pagination == pagination));
   }
 
   @override
@@ -58,7 +60,8 @@ abstract mixin class $BookmarkListStateCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$BookmarkListStateCopyWithImpl<$Res> implements $BookmarkListStateCopyWith<$Res> {
+class _$BookmarkListStateCopyWithImpl<$Res>
+    implements $BookmarkListStateCopyWith<$Res> {
   _$BookmarkListStateCopyWithImpl(this._self, this._then);
 
   final BookmarkListState _self;
diff --git a/packages/stream_feeds/lib/src/state/comment_list_state.freezed.dart b/packages/stream_feeds/lib/src/state/comment_list_state.freezed.dart
index 5fb36fe5..98f4eb6c 100644
--- a/packages/stream_feeds/lib/src/state/comment_list_state.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/comment_list_state.freezed.dart
@@ -20,10 +20,11 @@ mixin _$CommentListState {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $CommentListStateCopyWith<CommentListState> get copyWith => _$CommentListStateCopyWithImpl<CommentListState>(
-    this as CommentListState,
-    _$identity,
-  );
+  $CommentListStateCopyWith<CommentListState> get copyWith =>
+      _$CommentListStateCopyWithImpl<CommentListState>(
+        this as CommentListState,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -31,7 +32,8 @@ mixin _$CommentListState {
         (other.runtimeType == runtimeType &&
             other is CommentListState &&
             const DeepCollectionEquality().equals(other.comments, comments) &&
-            (identical(other.pagination, pagination) || other.pagination == pagination));
+            (identical(other.pagination, pagination) ||
+                other.pagination == pagination));
   }
 
   @override
@@ -58,7 +60,8 @@ abstract mixin class $CommentListStateCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$CommentListStateCopyWithImpl<$Res> implements $CommentListStateCopyWith<$Res> {
+class _$CommentListStateCopyWithImpl<$Res>
+    implements $CommentListStateCopyWith<$Res> {
   _$CommentListStateCopyWithImpl(this._self, this._then);
 
   final CommentListState _self;
diff --git a/packages/stream_feeds/lib/src/state/comment_reaction_list_state.freezed.dart b/packages/stream_feeds/lib/src/state/comment_reaction_list_state.freezed.dart
index 02a3d1fc..292d8566 100644
--- a/packages/stream_feeds/lib/src/state/comment_reaction_list_state.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/comment_reaction_list_state.freezed.dart
@@ -32,7 +32,8 @@ mixin _$CommentReactionListState {
         (other.runtimeType == runtimeType &&
             other is CommentReactionListState &&
             const DeepCollectionEquality().equals(other.reactions, reactions) &&
-            (identical(other.pagination, pagination) || other.pagination == pagination));
+            (identical(other.pagination, pagination) ||
+                other.pagination == pagination));
   }
 
   @override
@@ -59,7 +60,8 @@ abstract mixin class $CommentReactionListStateCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$CommentReactionListStateCopyWithImpl<$Res> implements $CommentReactionListStateCopyWith<$Res> {
+class _$CommentReactionListStateCopyWithImpl<$Res>
+    implements $CommentReactionListStateCopyWith<$Res> {
   _$CommentReactionListStateCopyWithImpl(this._self, this._then);
 
   final CommentReactionListState _self;
diff --git a/packages/stream_feeds/lib/src/state/comment_reply_list_state.freezed.dart b/packages/stream_feeds/lib/src/state/comment_reply_list_state.freezed.dart
index c42b078f..61fa9c93 100644
--- a/packages/stream_feeds/lib/src/state/comment_reply_list_state.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/comment_reply_list_state.freezed.dart
@@ -32,7 +32,8 @@ mixin _$CommentReplyListState {
         (other.runtimeType == runtimeType &&
             other is CommentReplyListState &&
             const DeepCollectionEquality().equals(other.replies, replies) &&
-            (identical(other.pagination, pagination) || other.pagination == pagination));
+            (identical(other.pagination, pagination) ||
+                other.pagination == pagination));
   }
 
   @override
@@ -59,7 +60,8 @@ abstract mixin class $CommentReplyListStateCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$CommentReplyListStateCopyWithImpl<$Res> implements $CommentReplyListStateCopyWith<$Res> {
+class _$CommentReplyListStateCopyWithImpl<$Res>
+    implements $CommentReplyListStateCopyWith<$Res> {
   _$CommentReplyListStateCopyWithImpl(this._self, this._then);
 
   final CommentReplyListState _self;
diff --git a/packages/stream_feeds/lib/src/state/feed_list_state.freezed.dart b/packages/stream_feeds/lib/src/state/feed_list_state.freezed.dart
index 3c7edf3d..d273ca4b 100644
--- a/packages/stream_feeds/lib/src/state/feed_list_state.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/feed_list_state.freezed.dart
@@ -20,10 +20,11 @@ mixin _$FeedListState {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $FeedListStateCopyWith<FeedListState> get copyWith => _$FeedListStateCopyWithImpl<FeedListState>(
-    this as FeedListState,
-    _$identity,
-  );
+  $FeedListStateCopyWith<FeedListState> get copyWith =>
+      _$FeedListStateCopyWithImpl<FeedListState>(
+        this as FeedListState,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -31,7 +32,8 @@ mixin _$FeedListState {
         (other.runtimeType == runtimeType &&
             other is FeedListState &&
             const DeepCollectionEquality().equals(other.feeds, feeds) &&
-            (identical(other.pagination, pagination) || other.pagination == pagination));
+            (identical(other.pagination, pagination) ||
+                other.pagination == pagination));
   }
 
   @override
@@ -58,7 +60,8 @@ abstract mixin class $FeedListStateCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$FeedListStateCopyWithImpl<$Res> implements $FeedListStateCopyWith<$Res> {
+class _$FeedListStateCopyWithImpl<$Res>
+    implements $FeedListStateCopyWith<$Res> {
   _$FeedListStateCopyWithImpl(this._self, this._then);
 
   final FeedListState _self;
diff --git a/packages/stream_feeds/lib/src/state/feed_state.freezed.dart b/packages/stream_feeds/lib/src/state/feed_state.freezed.dart
index 82c60cd5..4c16d12c 100644
--- a/packages/stream_feeds/lib/src/state/feed_state.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/feed_state.freezed.dart
@@ -31,7 +31,8 @@ mixin _$FeedState {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $FeedStateCopyWith<FeedState> get copyWith => _$FeedStateCopyWithImpl<FeedState>(this as FeedState, _$identity);
+  $FeedStateCopyWith<FeedState> get copyWith =>
+      _$FeedStateCopyWithImpl<FeedState>(this as FeedState, _$identity);
 
   @override
   bool operator ==(Object other) {
@@ -39,7 +40,8 @@ mixin _$FeedState {
         (other.runtimeType == runtimeType &&
             other is FeedState &&
             (identical(other.fid, fid) || other.fid == fid) &&
-            (identical(other.feedQuery, feedQuery) || other.feedQuery == feedQuery) &&
+            (identical(other.feedQuery, feedQuery) ||
+                other.feedQuery == feedQuery) &&
             const DeepCollectionEquality().equals(
               other.activities,
               activities,
@@ -56,7 +58,8 @@ mixin _$FeedState {
               followRequests,
             ) &&
             const DeepCollectionEquality().equals(other.members, members) &&
-            (identical(other.membersPagination, membersPagination) || other.membersPagination == membersPagination) &&
+            (identical(other.membersPagination, membersPagination) ||
+                other.membersPagination == membersPagination) &&
             const DeepCollectionEquality().equals(
               other.pinnedActivities,
               pinnedActivities,
@@ -93,7 +96,8 @@ mixin _$FeedState {
 
 /// @nodoc
 abstract mixin class $FeedStateCopyWith<$Res> {
-  factory $FeedStateCopyWith(FeedState value, $Res Function(FeedState) _then) = _$FeedStateCopyWithImpl;
+  factory $FeedStateCopyWith(FeedState value, $Res Function(FeedState) _then) =
+      _$FeedStateCopyWithImpl;
   @useResult
   $Res call({
     FeedId fid,
diff --git a/packages/stream_feeds/lib/src/state/follow_list_state.freezed.dart b/packages/stream_feeds/lib/src/state/follow_list_state.freezed.dart
index 1bb73386..ede8b700 100644
--- a/packages/stream_feeds/lib/src/state/follow_list_state.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/follow_list_state.freezed.dart
@@ -20,10 +20,11 @@ mixin _$FollowListState {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $FollowListStateCopyWith<FollowListState> get copyWith => _$FollowListStateCopyWithImpl<FollowListState>(
-    this as FollowListState,
-    _$identity,
-  );
+  $FollowListStateCopyWith<FollowListState> get copyWith =>
+      _$FollowListStateCopyWithImpl<FollowListState>(
+        this as FollowListState,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -31,7 +32,8 @@ mixin _$FollowListState {
         (other.runtimeType == runtimeType &&
             other is FollowListState &&
             const DeepCollectionEquality().equals(other.follows, follows) &&
-            (identical(other.pagination, pagination) || other.pagination == pagination));
+            (identical(other.pagination, pagination) ||
+                other.pagination == pagination));
   }
 
   @override
@@ -58,7 +60,8 @@ abstract mixin class $FollowListStateCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$FollowListStateCopyWithImpl<$Res> implements $FollowListStateCopyWith<$Res> {
+class _$FollowListStateCopyWithImpl<$Res>
+    implements $FollowListStateCopyWith<$Res> {
   _$FollowListStateCopyWithImpl(this._self, this._then);
 
   final FollowListState _self;
diff --git a/packages/stream_feeds/lib/src/state/member_list_state.freezed.dart b/packages/stream_feeds/lib/src/state/member_list_state.freezed.dart
index 469c3db6..7135dbc7 100644
--- a/packages/stream_feeds/lib/src/state/member_list_state.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/member_list_state.freezed.dart
@@ -20,10 +20,11 @@ mixin _$MemberListState {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $MemberListStateCopyWith<MemberListState> get copyWith => _$MemberListStateCopyWithImpl<MemberListState>(
-    this as MemberListState,
-    _$identity,
-  );
+  $MemberListStateCopyWith<MemberListState> get copyWith =>
+      _$MemberListStateCopyWithImpl<MemberListState>(
+        this as MemberListState,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -31,7 +32,8 @@ mixin _$MemberListState {
         (other.runtimeType == runtimeType &&
             other is MemberListState &&
             const DeepCollectionEquality().equals(other.members, members) &&
-            (identical(other.pagination, pagination) || other.pagination == pagination));
+            (identical(other.pagination, pagination) ||
+                other.pagination == pagination));
   }
 
   @override
@@ -58,7 +60,8 @@ abstract mixin class $MemberListStateCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$MemberListStateCopyWithImpl<$Res> implements $MemberListStateCopyWith<$Res> {
+class _$MemberListStateCopyWithImpl<$Res>
+    implements $MemberListStateCopyWith<$Res> {
   _$MemberListStateCopyWithImpl(this._self, this._then);
 
   final MemberListState _self;
diff --git a/packages/stream_feeds/lib/src/state/moderation_config_list_state.freezed.dart b/packages/stream_feeds/lib/src/state/moderation_config_list_state.freezed.dart
index 8fb87fe4..d83c32a9 100644
--- a/packages/stream_feeds/lib/src/state/moderation_config_list_state.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/moderation_config_list_state.freezed.dart
@@ -32,7 +32,8 @@ mixin _$ModerationConfigListState {
         (other.runtimeType == runtimeType &&
             other is ModerationConfigListState &&
             const DeepCollectionEquality().equals(other.configs, configs) &&
-            (identical(other.pagination, pagination) || other.pagination == pagination));
+            (identical(other.pagination, pagination) ||
+                other.pagination == pagination));
   }
 
   @override
@@ -59,7 +60,8 @@ abstract mixin class $ModerationConfigListStateCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$ModerationConfigListStateCopyWithImpl<$Res> implements $ModerationConfigListStateCopyWith<$Res> {
+class _$ModerationConfigListStateCopyWithImpl<$Res>
+    implements $ModerationConfigListStateCopyWith<$Res> {
   _$ModerationConfigListStateCopyWithImpl(this._self, this._then);
 
   final ModerationConfigListState _self;
diff --git a/packages/stream_feeds/lib/src/state/poll_list_state.freezed.dart b/packages/stream_feeds/lib/src/state/poll_list_state.freezed.dart
index c3925753..73aa63a8 100644
--- a/packages/stream_feeds/lib/src/state/poll_list_state.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/poll_list_state.freezed.dart
@@ -20,10 +20,11 @@ mixin _$PollListState {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $PollListStateCopyWith<PollListState> get copyWith => _$PollListStateCopyWithImpl<PollListState>(
-    this as PollListState,
-    _$identity,
-  );
+  $PollListStateCopyWith<PollListState> get copyWith =>
+      _$PollListStateCopyWithImpl<PollListState>(
+        this as PollListState,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -31,7 +32,8 @@ mixin _$PollListState {
         (other.runtimeType == runtimeType &&
             other is PollListState &&
             const DeepCollectionEquality().equals(other.polls, polls) &&
-            (identical(other.pagination, pagination) || other.pagination == pagination));
+            (identical(other.pagination, pagination) ||
+                other.pagination == pagination));
   }
 
   @override
@@ -58,7 +60,8 @@ abstract mixin class $PollListStateCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$PollListStateCopyWithImpl<$Res> implements $PollListStateCopyWith<$Res> {
+class _$PollListStateCopyWithImpl<$Res>
+    implements $PollListStateCopyWith<$Res> {
   _$PollListStateCopyWithImpl(this._self, this._then);
 
   final PollListState _self;
diff --git a/packages/stream_feeds/lib/src/state/poll_vote_list_state.freezed.dart b/packages/stream_feeds/lib/src/state/poll_vote_list_state.freezed.dart
index 58026abd..7398fb45 100644
--- a/packages/stream_feeds/lib/src/state/poll_vote_list_state.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/poll_vote_list_state.freezed.dart
@@ -20,10 +20,11 @@ mixin _$PollVoteListState {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $PollVoteListStateCopyWith<PollVoteListState> get copyWith => _$PollVoteListStateCopyWithImpl<PollVoteListState>(
-    this as PollVoteListState,
-    _$identity,
-  );
+  $PollVoteListStateCopyWith<PollVoteListState> get copyWith =>
+      _$PollVoteListStateCopyWithImpl<PollVoteListState>(
+        this as PollVoteListState,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -31,7 +32,8 @@ mixin _$PollVoteListState {
         (other.runtimeType == runtimeType &&
             other is PollVoteListState &&
             const DeepCollectionEquality().equals(other.votes, votes) &&
-            (identical(other.pagination, pagination) || other.pagination == pagination));
+            (identical(other.pagination, pagination) ||
+                other.pagination == pagination));
   }
 
   @override
@@ -58,7 +60,8 @@ abstract mixin class $PollVoteListStateCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$PollVoteListStateCopyWithImpl<$Res> implements $PollVoteListStateCopyWith<$Res> {
+class _$PollVoteListStateCopyWithImpl<$Res>
+    implements $PollVoteListStateCopyWith<$Res> {
   _$PollVoteListStateCopyWithImpl(this._self, this._then);
 
   final PollVoteListState _self;
diff --git a/packages/stream_feeds/lib/src/state/query/activities_query.freezed.dart b/packages/stream_feeds/lib/src/state/query/activities_query.freezed.dart
index 1e974c21..ac35a96f 100644
--- a/packages/stream_feeds/lib/src/state/query/activities_query.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/query/activities_query.freezed.dart
@@ -23,10 +23,11 @@ mixin _$ActivitiesQuery {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $ActivitiesQueryCopyWith<ActivitiesQuery> get copyWith => _$ActivitiesQueryCopyWithImpl<ActivitiesQuery>(
-    this as ActivitiesQuery,
-    _$identity,
-  );
+  $ActivitiesQueryCopyWith<ActivitiesQuery> get copyWith =>
+      _$ActivitiesQueryCopyWithImpl<ActivitiesQuery>(
+        this as ActivitiesQuery,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -37,7 +38,8 @@ mixin _$ActivitiesQuery {
             const DeepCollectionEquality().equals(other.sort, sort) &&
             (identical(other.limit, limit) || other.limit == limit) &&
             (identical(other.next, next) || other.next == next) &&
-            (identical(other.previous, previous) || other.previous == previous));
+            (identical(other.previous, previous) ||
+                other.previous == previous));
   }
 
   @override
@@ -73,7 +75,8 @@ abstract mixin class $ActivitiesQueryCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$ActivitiesQueryCopyWithImpl<$Res> implements $ActivitiesQueryCopyWith<$Res> {
+class _$ActivitiesQueryCopyWithImpl<$Res>
+    implements $ActivitiesQueryCopyWith<$Res> {
   _$ActivitiesQueryCopyWithImpl(this._self, this._then);
 
   final ActivitiesQuery _self;
diff --git a/packages/stream_feeds/lib/src/state/query/activity_comments_query.freezed.dart b/packages/stream_feeds/lib/src/state/query/activity_comments_query.freezed.dart
index 03135dfb..59839f3c 100644
--- a/packages/stream_feeds/lib/src/state/query/activity_comments_query.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/query/activity_comments_query.freezed.dart
@@ -37,14 +37,18 @@ mixin _$ActivityCommentsQuery {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is ActivityCommentsQuery &&
-            (identical(other.objectId, objectId) || other.objectId == objectId) &&
-            (identical(other.objectType, objectType) || other.objectType == objectType) &&
+            (identical(other.objectId, objectId) ||
+                other.objectId == objectId) &&
+            (identical(other.objectType, objectType) ||
+                other.objectType == objectType) &&
             (identical(other.sort, sort) || other.sort == sort) &&
             (identical(other.depth, depth) || other.depth == depth) &&
             (identical(other.limit, limit) || other.limit == limit) &&
-            (identical(other.repliesLimit, repliesLimit) || other.repliesLimit == repliesLimit) &&
+            (identical(other.repliesLimit, repliesLimit) ||
+                other.repliesLimit == repliesLimit) &&
             (identical(other.next, next) || other.next == next) &&
-            (identical(other.previous, previous) || other.previous == previous));
+            (identical(other.previous, previous) ||
+                other.previous == previous));
   }
 
   @override
@@ -86,7 +90,8 @@ abstract mixin class $ActivityCommentsQueryCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$ActivityCommentsQueryCopyWithImpl<$Res> implements $ActivityCommentsQueryCopyWith<$Res> {
+class _$ActivityCommentsQueryCopyWithImpl<$Res>
+    implements $ActivityCommentsQueryCopyWith<$Res> {
   _$ActivityCommentsQueryCopyWithImpl(this._self, this._then);
 
   final ActivityCommentsQuery _self;
diff --git a/packages/stream_feeds/lib/src/state/query/activity_reactions_query.freezed.dart b/packages/stream_feeds/lib/src/state/query/activity_reactions_query.freezed.dart
index 8006a7db..cec9e09e 100644
--- a/packages/stream_feeds/lib/src/state/query/activity_reactions_query.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/query/activity_reactions_query.freezed.dart
@@ -35,12 +35,14 @@ mixin _$ActivityReactionsQuery {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is ActivityReactionsQuery &&
-            (identical(other.activityId, activityId) || other.activityId == activityId) &&
+            (identical(other.activityId, activityId) ||
+                other.activityId == activityId) &&
             (identical(other.filter, filter) || other.filter == filter) &&
             const DeepCollectionEquality().equals(other.sort, sort) &&
             (identical(other.limit, limit) || other.limit == limit) &&
             (identical(other.next, next) || other.next == next) &&
-            (identical(other.previous, previous) || other.previous == previous));
+            (identical(other.previous, previous) ||
+                other.previous == previous));
   }
 
   @override
@@ -78,7 +80,8 @@ abstract mixin class $ActivityReactionsQueryCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$ActivityReactionsQueryCopyWithImpl<$Res> implements $ActivityReactionsQueryCopyWith<$Res> {
+class _$ActivityReactionsQueryCopyWithImpl<$Res>
+    implements $ActivityReactionsQueryCopyWith<$Res> {
   _$ActivityReactionsQueryCopyWithImpl(this._self, this._then);
 
   final ActivityReactionsQuery _self;
diff --git a/packages/stream_feeds/lib/src/state/query/bookmark_folders_query.freezed.dart b/packages/stream_feeds/lib/src/state/query/bookmark_folders_query.freezed.dart
index de3c2995..89e28f92 100644
--- a/packages/stream_feeds/lib/src/state/query/bookmark_folders_query.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/query/bookmark_folders_query.freezed.dart
@@ -38,7 +38,8 @@ mixin _$BookmarkFoldersQuery {
             const DeepCollectionEquality().equals(other.sort, sort) &&
             (identical(other.limit, limit) || other.limit == limit) &&
             (identical(other.next, next) || other.next == next) &&
-            (identical(other.previous, previous) || other.previous == previous));
+            (identical(other.previous, previous) ||
+                other.previous == previous));
   }
 
   @override
@@ -74,7 +75,8 @@ abstract mixin class $BookmarkFoldersQueryCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$BookmarkFoldersQueryCopyWithImpl<$Res> implements $BookmarkFoldersQueryCopyWith<$Res> {
+class _$BookmarkFoldersQueryCopyWithImpl<$Res>
+    implements $BookmarkFoldersQueryCopyWith<$Res> {
   _$BookmarkFoldersQueryCopyWithImpl(this._self, this._then);
 
   final BookmarkFoldersQuery _self;
diff --git a/packages/stream_feeds/lib/src/state/query/bookmarks_query.freezed.dart b/packages/stream_feeds/lib/src/state/query/bookmarks_query.freezed.dart
index fd6da636..bf71a851 100644
--- a/packages/stream_feeds/lib/src/state/query/bookmarks_query.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/query/bookmarks_query.freezed.dart
@@ -23,10 +23,11 @@ mixin _$BookmarksQuery {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $BookmarksQueryCopyWith<BookmarksQuery> get copyWith => _$BookmarksQueryCopyWithImpl<BookmarksQuery>(
-    this as BookmarksQuery,
-    _$identity,
-  );
+  $BookmarksQueryCopyWith<BookmarksQuery> get copyWith =>
+      _$BookmarksQueryCopyWithImpl<BookmarksQuery>(
+        this as BookmarksQuery,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -37,7 +38,8 @@ mixin _$BookmarksQuery {
             const DeepCollectionEquality().equals(other.sort, sort) &&
             (identical(other.limit, limit) || other.limit == limit) &&
             (identical(other.next, next) || other.next == next) &&
-            (identical(other.previous, previous) || other.previous == previous));
+            (identical(other.previous, previous) ||
+                other.previous == previous));
   }
 
   @override
@@ -73,7 +75,8 @@ abstract mixin class $BookmarksQueryCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$BookmarksQueryCopyWithImpl<$Res> implements $BookmarksQueryCopyWith<$Res> {
+class _$BookmarksQueryCopyWithImpl<$Res>
+    implements $BookmarksQueryCopyWith<$Res> {
   _$BookmarksQueryCopyWithImpl(this._self, this._then);
 
   final BookmarksQuery _self;
diff --git a/packages/stream_feeds/lib/src/state/query/comment_reactions_query.freezed.dart b/packages/stream_feeds/lib/src/state/query/comment_reactions_query.freezed.dart
index 14dea5e0..c7a49ca5 100644
--- a/packages/stream_feeds/lib/src/state/query/comment_reactions_query.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/query/comment_reactions_query.freezed.dart
@@ -35,12 +35,14 @@ mixin _$CommentReactionsQuery {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is CommentReactionsQuery &&
-            (identical(other.commentId, commentId) || other.commentId == commentId) &&
+            (identical(other.commentId, commentId) ||
+                other.commentId == commentId) &&
             (identical(other.filter, filter) || other.filter == filter) &&
             const DeepCollectionEquality().equals(other.sort, sort) &&
             (identical(other.limit, limit) || other.limit == limit) &&
             (identical(other.next, next) || other.next == next) &&
-            (identical(other.previous, previous) || other.previous == previous));
+            (identical(other.previous, previous) ||
+                other.previous == previous));
   }
 
   @override
@@ -78,7 +80,8 @@ abstract mixin class $CommentReactionsQueryCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$CommentReactionsQueryCopyWithImpl<$Res> implements $CommentReactionsQueryCopyWith<$Res> {
+class _$CommentReactionsQueryCopyWithImpl<$Res>
+    implements $CommentReactionsQueryCopyWith<$Res> {
   _$CommentReactionsQueryCopyWithImpl(this._self, this._then);
 
   final CommentReactionsQuery _self;
diff --git a/packages/stream_feeds/lib/src/state/query/comment_replies_query.freezed.dart b/packages/stream_feeds/lib/src/state/query/comment_replies_query.freezed.dart
index b1cffb41..3a365586 100644
--- a/packages/stream_feeds/lib/src/state/query/comment_replies_query.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/query/comment_replies_query.freezed.dart
@@ -36,13 +36,16 @@ mixin _$CommentRepliesQuery {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is CommentRepliesQuery &&
-            (identical(other.commentId, commentId) || other.commentId == commentId) &&
+            (identical(other.commentId, commentId) ||
+                other.commentId == commentId) &&
             (identical(other.sort, sort) || other.sort == sort) &&
             (identical(other.depth, depth) || other.depth == depth) &&
             (identical(other.limit, limit) || other.limit == limit) &&
-            (identical(other.repliesLimit, repliesLimit) || other.repliesLimit == repliesLimit) &&
+            (identical(other.repliesLimit, repliesLimit) ||
+                other.repliesLimit == repliesLimit) &&
             (identical(other.next, next) || other.next == next) &&
-            (identical(other.previous, previous) || other.previous == previous));
+            (identical(other.previous, previous) ||
+                other.previous == previous));
   }
 
   @override
@@ -82,7 +85,8 @@ abstract mixin class $CommentRepliesQueryCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$CommentRepliesQueryCopyWithImpl<$Res> implements $CommentRepliesQueryCopyWith<$Res> {
+class _$CommentRepliesQueryCopyWithImpl<$Res>
+    implements $CommentRepliesQueryCopyWith<$Res> {
   _$CommentRepliesQueryCopyWithImpl(this._self, this._then);
 
   final CommentRepliesQuery _self;
diff --git a/packages/stream_feeds/lib/src/state/query/comments_query.freezed.dart b/packages/stream_feeds/lib/src/state/query/comments_query.freezed.dart
index e37458b9..b534c22e 100644
--- a/packages/stream_feeds/lib/src/state/query/comments_query.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/query/comments_query.freezed.dart
@@ -23,10 +23,11 @@ mixin _$CommentsQuery {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $CommentsQueryCopyWith<CommentsQuery> get copyWith => _$CommentsQueryCopyWithImpl<CommentsQuery>(
-    this as CommentsQuery,
-    _$identity,
-  );
+  $CommentsQueryCopyWith<CommentsQuery> get copyWith =>
+      _$CommentsQueryCopyWithImpl<CommentsQuery>(
+        this as CommentsQuery,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -37,11 +38,13 @@ mixin _$CommentsQuery {
             (identical(other.sort, sort) || other.sort == sort) &&
             (identical(other.limit, limit) || other.limit == limit) &&
             (identical(other.next, next) || other.next == next) &&
-            (identical(other.previous, previous) || other.previous == previous));
+            (identical(other.previous, previous) ||
+                other.previous == previous));
   }
 
   @override
-  int get hashCode => Object.hash(runtimeType, filter, sort, limit, next, previous);
+  int get hashCode =>
+      Object.hash(runtimeType, filter, sort, limit, next, previous);
 
   @override
   String toString() {
@@ -66,7 +69,8 @@ abstract mixin class $CommentsQueryCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$CommentsQueryCopyWithImpl<$Res> implements $CommentsQueryCopyWith<$Res> {
+class _$CommentsQueryCopyWithImpl<$Res>
+    implements $CommentsQueryCopyWith<$Res> {
   _$CommentsQueryCopyWithImpl(this._self, this._then);
 
   final CommentsQuery _self;
diff --git a/packages/stream_feeds/lib/src/state/query/feed_query.freezed.dart b/packages/stream_feeds/lib/src/state/query/feed_query.freezed.dart
index 7c01318a..eb581bf5 100644
--- a/packages/stream_feeds/lib/src/state/query/feed_query.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/query/feed_query.freezed.dart
@@ -31,7 +31,8 @@ mixin _$FeedQuery {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $FeedQueryCopyWith<FeedQuery> get copyWith => _$FeedQueryCopyWithImpl<FeedQuery>(this as FeedQuery, _$identity);
+  $FeedQueryCopyWith<FeedQuery> get copyWith =>
+      _$FeedQueryCopyWithImpl<FeedQuery>(this as FeedQuery, _$identity);
 
   @override
   bool operator ==(Object other) {
@@ -39,22 +40,29 @@ mixin _$FeedQuery {
         (other.runtimeType == runtimeType &&
             other is FeedQuery &&
             (identical(other.fid, fid) || other.fid == fid) &&
-            (identical(other.activityFilter, activityFilter) || other.activityFilter == activityFilter) &&
-            (identical(other.activityLimit, activityLimit) || other.activityLimit == activityLimit) &&
-            (identical(other.activityNext, activityNext) || other.activityNext == activityNext) &&
-            (identical(other.activityPrevious, activityPrevious) || other.activityPrevious == activityPrevious) &&
+            (identical(other.activityFilter, activityFilter) ||
+                other.activityFilter == activityFilter) &&
+            (identical(other.activityLimit, activityLimit) ||
+                other.activityLimit == activityLimit) &&
+            (identical(other.activityNext, activityNext) ||
+                other.activityNext == activityNext) &&
+            (identical(other.activityPrevious, activityPrevious) ||
+                other.activityPrevious == activityPrevious) &&
             (identical(other.data, data) || other.data == data) &&
             const DeepCollectionEquality().equals(
               other.externalRanking,
               externalRanking,
             ) &&
-            (identical(other.followerLimit, followerLimit) || other.followerLimit == followerLimit) &&
-            (identical(other.followingLimit, followingLimit) || other.followingLimit == followingLimit) &&
+            (identical(other.followerLimit, followerLimit) ||
+                other.followerLimit == followerLimit) &&
+            (identical(other.followingLimit, followingLimit) ||
+                other.followingLimit == followingLimit) &&
             const DeepCollectionEquality().equals(
               other.interestWeights,
               interestWeights,
             ) &&
-            (identical(other.memberLimit, memberLimit) || other.memberLimit == memberLimit) &&
+            (identical(other.memberLimit, memberLimit) ||
+                other.memberLimit == memberLimit) &&
             (identical(other.view, view) || other.view == view) &&
             (identical(other.watch, watch) || other.watch == watch));
   }
@@ -85,7 +93,8 @@ mixin _$FeedQuery {
 
 /// @nodoc
 abstract mixin class $FeedQueryCopyWith<$Res> {
-  factory $FeedQueryCopyWith(FeedQuery value, $Res Function(FeedQuery) _then) = _$FeedQueryCopyWithImpl;
+  factory $FeedQueryCopyWith(FeedQuery value, $Res Function(FeedQuery) _then) =
+      _$FeedQueryCopyWithImpl;
   @useResult
   $Res call({
     FeedId fid,
diff --git a/packages/stream_feeds/lib/src/state/query/feeds_query.freezed.dart b/packages/stream_feeds/lib/src/state/query/feeds_query.freezed.dart
index 257a9a41..c750c7e2 100644
--- a/packages/stream_feeds/lib/src/state/query/feeds_query.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/query/feeds_query.freezed.dart
@@ -24,7 +24,8 @@ mixin _$FeedsQuery {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $FeedsQueryCopyWith<FeedsQuery> get copyWith => _$FeedsQueryCopyWithImpl<FeedsQuery>(this as FeedsQuery, _$identity);
+  $FeedsQueryCopyWith<FeedsQuery> get copyWith =>
+      _$FeedsQueryCopyWithImpl<FeedsQuery>(this as FeedsQuery, _$identity);
 
   @override
   bool operator ==(Object other) {
@@ -35,7 +36,8 @@ mixin _$FeedsQuery {
             const DeepCollectionEquality().equals(other.sort, sort) &&
             (identical(other.limit, limit) || other.limit == limit) &&
             (identical(other.next, next) || other.next == next) &&
-            (identical(other.previous, previous) || other.previous == previous) &&
+            (identical(other.previous, previous) ||
+                other.previous == previous) &&
             (identical(other.watch, watch) || other.watch == watch));
   }
 
diff --git a/packages/stream_feeds/lib/src/state/query/follows_query.freezed.dart b/packages/stream_feeds/lib/src/state/query/follows_query.freezed.dart
index 2f1613dd..760da67b 100644
--- a/packages/stream_feeds/lib/src/state/query/follows_query.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/query/follows_query.freezed.dart
@@ -23,10 +23,11 @@ mixin _$FollowsQuery {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $FollowsQueryCopyWith<FollowsQuery> get copyWith => _$FollowsQueryCopyWithImpl<FollowsQuery>(
-    this as FollowsQuery,
-    _$identity,
-  );
+  $FollowsQueryCopyWith<FollowsQuery> get copyWith =>
+      _$FollowsQueryCopyWithImpl<FollowsQuery>(
+        this as FollowsQuery,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -37,7 +38,8 @@ mixin _$FollowsQuery {
             const DeepCollectionEquality().equals(other.sort, sort) &&
             (identical(other.limit, limit) || other.limit == limit) &&
             (identical(other.next, next) || other.next == next) &&
-            (identical(other.previous, previous) || other.previous == previous));
+            (identical(other.previous, previous) ||
+                other.previous == previous));
   }
 
   @override
diff --git a/packages/stream_feeds/lib/src/state/query/members_query.freezed.dart b/packages/stream_feeds/lib/src/state/query/members_query.freezed.dart
index 349904b6..79c9c923 100644
--- a/packages/stream_feeds/lib/src/state/query/members_query.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/query/members_query.freezed.dart
@@ -24,10 +24,11 @@ mixin _$MembersQuery {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $MembersQueryCopyWith<MembersQuery> get copyWith => _$MembersQueryCopyWithImpl<MembersQuery>(
-    this as MembersQuery,
-    _$identity,
-  );
+  $MembersQueryCopyWith<MembersQuery> get copyWith =>
+      _$MembersQueryCopyWithImpl<MembersQuery>(
+        this as MembersQuery,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -39,7 +40,8 @@ mixin _$MembersQuery {
             const DeepCollectionEquality().equals(other.sort, sort) &&
             (identical(other.limit, limit) || other.limit == limit) &&
             (identical(other.next, next) || other.next == next) &&
-            (identical(other.previous, previous) || other.previous == previous));
+            (identical(other.previous, previous) ||
+                other.previous == previous));
   }
 
   @override
diff --git a/packages/stream_feeds/lib/src/state/query/moderation_configs_query.freezed.dart b/packages/stream_feeds/lib/src/state/query/moderation_configs_query.freezed.dart
index fbf6636a..9f443aea 100644
--- a/packages/stream_feeds/lib/src/state/query/moderation_configs_query.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/query/moderation_configs_query.freezed.dart
@@ -38,7 +38,8 @@ mixin _$ModerationConfigsQuery {
             const DeepCollectionEquality().equals(other.sort, sort) &&
             (identical(other.limit, limit) || other.limit == limit) &&
             (identical(other.next, next) || other.next == next) &&
-            (identical(other.previous, previous) || other.previous == previous));
+            (identical(other.previous, previous) ||
+                other.previous == previous));
   }
 
   @override
@@ -74,7 +75,8 @@ abstract mixin class $ModerationConfigsQueryCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$ModerationConfigsQueryCopyWithImpl<$Res> implements $ModerationConfigsQueryCopyWith<$Res> {
+class _$ModerationConfigsQueryCopyWithImpl<$Res>
+    implements $ModerationConfigsQueryCopyWith<$Res> {
   _$ModerationConfigsQueryCopyWithImpl(this._self, this._then);
 
   final ModerationConfigsQuery _self;
diff --git a/packages/stream_feeds/lib/src/state/query/poll_votes_query.freezed.dart b/packages/stream_feeds/lib/src/state/query/poll_votes_query.freezed.dart
index 9626756f..cf74df03 100644
--- a/packages/stream_feeds/lib/src/state/query/poll_votes_query.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/query/poll_votes_query.freezed.dart
@@ -25,10 +25,11 @@ mixin _$PollVotesQuery {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $PollVotesQueryCopyWith<PollVotesQuery> get copyWith => _$PollVotesQueryCopyWithImpl<PollVotesQuery>(
-    this as PollVotesQuery,
-    _$identity,
-  );
+  $PollVotesQueryCopyWith<PollVotesQuery> get copyWith =>
+      _$PollVotesQueryCopyWithImpl<PollVotesQuery>(
+        this as PollVotesQuery,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -41,7 +42,8 @@ mixin _$PollVotesQuery {
             const DeepCollectionEquality().equals(other.sort, sort) &&
             (identical(other.limit, limit) || other.limit == limit) &&
             (identical(other.next, next) || other.next == next) &&
-            (identical(other.previous, previous) || other.previous == previous));
+            (identical(other.previous, previous) ||
+                other.previous == previous));
   }
 
   @override
@@ -81,7 +83,8 @@ abstract mixin class $PollVotesQueryCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$PollVotesQueryCopyWithImpl<$Res> implements $PollVotesQueryCopyWith<$Res> {
+class _$PollVotesQueryCopyWithImpl<$Res>
+    implements $PollVotesQueryCopyWith<$Res> {
   _$PollVotesQueryCopyWithImpl(this._self, this._then);
 
   final PollVotesQuery _self;
diff --git a/packages/stream_feeds/lib/src/state/query/polls_query.freezed.dart b/packages/stream_feeds/lib/src/state/query/polls_query.freezed.dart
index 413ca850..6426ee74 100644
--- a/packages/stream_feeds/lib/src/state/query/polls_query.freezed.dart
+++ b/packages/stream_feeds/lib/src/state/query/polls_query.freezed.dart
@@ -23,7 +23,8 @@ mixin _$PollsQuery {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $PollsQueryCopyWith<PollsQuery> get copyWith => _$PollsQueryCopyWithImpl<PollsQuery>(this as PollsQuery, _$identity);
+  $PollsQueryCopyWith<PollsQuery> get copyWith =>
+      _$PollsQueryCopyWithImpl<PollsQuery>(this as PollsQuery, _$identity);
 
   @override
   bool operator ==(Object other) {
@@ -34,7 +35,8 @@ mixin _$PollsQuery {
             const DeepCollectionEquality().equals(other.sort, sort) &&
             (identical(other.limit, limit) || other.limit == limit) &&
             (identical(other.next, next) || other.next == next) &&
-            (identical(other.previous, previous) || other.previous == previous));
+            (identical(other.previous, previous) ||
+                other.previous == previous));
   }
 
   @override
diff --git a/packages/stream_feeds/lib/src/ws/events/events.freezed.dart b/packages/stream_feeds/lib/src/ws/events/events.freezed.dart
index 1c17640b..98fc318f 100644
--- a/packages/stream_feeds/lib/src/ws/events/events.freezed.dart
+++ b/packages/stream_feeds/lib/src/ws/events/events.freezed.dart
@@ -25,10 +25,11 @@ mixin _$HealthCheckEvent {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $HealthCheckEventCopyWith<HealthCheckEvent> get copyWith => _$HealthCheckEventCopyWithImpl<HealthCheckEvent>(
-    this as HealthCheckEvent,
-    _$identity,
-  );
+  $HealthCheckEventCopyWith<HealthCheckEvent> get copyWith =>
+      _$HealthCheckEventCopyWithImpl<HealthCheckEvent>(
+        this as HealthCheckEvent,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
@@ -36,11 +37,14 @@ mixin _$HealthCheckEvent {
         (other.runtimeType == runtimeType &&
             other is HealthCheckEvent &&
             (identical(other.cid, cid) || other.cid == cid) &&
-            (identical(other.connectionId, connectionId) || other.connectionId == connectionId) &&
-            (identical(other.createdAt, createdAt) || other.createdAt == createdAt) &&
+            (identical(other.connectionId, connectionId) ||
+                other.connectionId == connectionId) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
             const DeepCollectionEquality().equals(other.custom, custom) &&
             (identical(other.me, me) || other.me == me) &&
-            (identical(other.receivedAt, receivedAt) || other.receivedAt == receivedAt) &&
+            (identical(other.receivedAt, receivedAt) ||
+                other.receivedAt == receivedAt) &&
             (identical(other.type, type) || other.type == type));
   }
 
@@ -81,7 +85,8 @@ abstract mixin class $HealthCheckEventCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$HealthCheckEventCopyWithImpl<$Res> implements $HealthCheckEventCopyWith<$Res> {
+class _$HealthCheckEventCopyWithImpl<$Res>
+    implements $HealthCheckEventCopyWith<$Res> {
   _$HealthCheckEventCopyWithImpl(this._self, this._then);
 
   final HealthCheckEvent _self;
@@ -146,24 +151,28 @@ mixin _$ConnectedEvent {
   /// with the given fields replaced by the non-null parameter values.
   @JsonKey(includeFromJson: false, includeToJson: false)
   @pragma('vm:prefer-inline')
-  $ConnectedEventCopyWith<ConnectedEvent> get copyWith => _$ConnectedEventCopyWithImpl<ConnectedEvent>(
-    this as ConnectedEvent,
-    _$identity,
-  );
+  $ConnectedEventCopyWith<ConnectedEvent> get copyWith =>
+      _$ConnectedEventCopyWithImpl<ConnectedEvent>(
+        this as ConnectedEvent,
+        _$identity,
+      );
 
   @override
   bool operator ==(Object other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is ConnectedEvent &&
-            (identical(other.connectionId, connectionId) || other.connectionId == connectionId) &&
-            (identical(other.createdAt, createdAt) || other.createdAt == createdAt) &&
+            (identical(other.connectionId, connectionId) ||
+                other.connectionId == connectionId) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
             (identical(other.me, me) || other.me == me) &&
             (identical(other.type, type) || other.type == type));
   }
 
   @override
-  int get hashCode => Object.hash(runtimeType, connectionId, createdAt, me, type);
+  int get hashCode =>
+      Object.hash(runtimeType, connectionId, createdAt, me, type);
 
   @override
   String toString() {
@@ -187,7 +196,8 @@ abstract mixin class $ConnectedEventCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$ConnectedEventCopyWithImpl<$Res> implements $ConnectedEventCopyWith<$Res> {
+class _$ConnectedEventCopyWithImpl<$Res>
+    implements $ConnectedEventCopyWith<$Res> {
   _$ConnectedEventCopyWithImpl(this._self, this._then);
 
   final ConnectedEvent _self;
@@ -248,14 +258,17 @@ mixin _$ConnectionErrorEvent {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is ConnectionErrorEvent &&
-            (identical(other.connectionId, connectionId) || other.connectionId == connectionId) &&
-            (identical(other.createdAt, createdAt) || other.createdAt == createdAt) &&
+            (identical(other.connectionId, connectionId) ||
+                other.connectionId == connectionId) &&
+            (identical(other.createdAt, createdAt) ||
+                other.createdAt == createdAt) &&
             (identical(other.error, error) || other.error == error) &&
             (identical(other.type, type) || other.type == type));
   }
 
   @override
-  int get hashCode => Object.hash(runtimeType, connectionId, createdAt, error, type);
+  int get hashCode =>
+      Object.hash(runtimeType, connectionId, createdAt, error, type);
 
   @override
   String toString() {
@@ -279,7 +292,8 @@ abstract mixin class $ConnectionErrorEventCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$ConnectionErrorEventCopyWithImpl<$Res> implements $ConnectionErrorEventCopyWith<$Res> {
+class _$ConnectionErrorEventCopyWithImpl<$Res>
+    implements $ConnectionErrorEventCopyWith<$Res> {
   _$ConnectionErrorEventCopyWithImpl(this._self, this._then);
 
   final ConnectionErrorEvent _self;
diff --git a/packages/stream_feeds/lib/src/ws/events/events.g.dart b/packages/stream_feeds/lib/src/ws/events/events.g.dart
index 0a2bd582..9f9b0384 100644
--- a/packages/stream_feeds/lib/src/ws/events/events.g.dart
+++ b/packages/stream_feeds/lib/src/ws/events/events.g.dart
@@ -6,33 +6,37 @@ part of 'events.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-HealthCheckEvent _$HealthCheckEventFromJson(Map<String, dynamic> json) => HealthCheckEvent(
-  cid: json['cid'] as String?,
-  connectionId: json['connection_id'] as String,
-  createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
-  ),
-  custom: json['custom'] as Map<String, dynamic>,
-  me: json['me'] == null ? null : OwnUserResponse.fromJson(json['me'] as Map<String, dynamic>),
-  receivedAt: _$JsonConverterFromJson<int, DateTime>(
-    json['received_at'],
-    const EpochDateTimeConverter().fromJson,
-  ),
-  type: json['type'] as String? ?? 'health.check',
-);
+HealthCheckEvent _$HealthCheckEventFromJson(Map<String, dynamic> json) =>
+    HealthCheckEvent(
+      cid: json['cid'] as String?,
+      connectionId: json['connection_id'] as String,
+      createdAt: const EpochDateTimeConverter().fromJson(
+        json['created_at'] as Object,
+      ),
+      custom: json['custom'] as Map<String, dynamic>,
+      me: json['me'] == null
+          ? null
+          : OwnUserResponse.fromJson(json['me'] as Map<String, dynamic>),
+      receivedAt: _$JsonConverterFromJson<Object, DateTime>(
+        json['received_at'],
+        const EpochDateTimeConverter().fromJson,
+      ),
+      type: json['type'] as String? ?? 'health.check',
+    );
 
-Map<String, dynamic> _$HealthCheckEventToJson(HealthCheckEvent instance) => <String, dynamic>{
-  'cid': instance.cid,
-  'connection_id': instance.connectionId,
-  'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
-  'custom': instance.custom,
-  'me': instance.me?.toJson(),
-  'received_at': _$JsonConverterToJson<int, DateTime>(
-    instance.receivedAt,
-    const EpochDateTimeConverter().toJson,
-  ),
-  'type': instance.type,
-};
+Map<String, dynamic> _$HealthCheckEventToJson(HealthCheckEvent instance) =>
+    <String, dynamic>{
+      'cid': instance.cid,
+      'connection_id': instance.connectionId,
+      'created_at': const EpochDateTimeConverter().toJson(instance.createdAt),
+      'custom': instance.custom,
+      'me': instance.me?.toJson(),
+      'received_at': _$JsonConverterToJson<Object, DateTime>(
+        instance.receivedAt,
+        const EpochDateTimeConverter().toJson,
+      ),
+      'type': instance.type,
+    };
 
 Value? _$JsonConverterFromJson<Json, Value>(
   Object? json,
@@ -44,21 +48,22 @@ Json? _$JsonConverterToJson<Json, Value>(
   Json? Function(Value value) toJson,
 ) => value == null ? null : toJson(value);
 
-ConnectedEvent _$ConnectedEventFromJson(Map<String, dynamic> json) => ConnectedEvent(
-  connectionId: json['connection_id'] as String,
-  createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
-  ),
-  me: OwnUserResponse.fromJson(json['me'] as Map<String, dynamic>),
-  type: json['type'] as String? ?? 'connection.ok',
-);
+ConnectedEvent _$ConnectedEventFromJson(Map<String, dynamic> json) =>
+    ConnectedEvent(
+      connectionId: json['connection_id'] as String,
+      createdAt: const EpochDateTimeConverter().fromJson(
+        json['created_at'] as Object,
+      ),
+      me: OwnUserResponse.fromJson(json['me'] as Map<String, dynamic>),
+      type: json['type'] as String? ?? 'connection.ok',
+    );
 
 ConnectionErrorEvent _$ConnectionErrorEventFromJson(
   Map<String, dynamic> json,
 ) => ConnectionErrorEvent(
   connectionId: json['connection_id'] as String,
   createdAt: const EpochDateTimeConverter().fromJson(
-    (json['created_at'] as num).toInt(),
+    json['created_at'] as Object,
   ),
   error: StreamApiError.fromJson(json['error'] as Map<String, dynamic>),
   type: json['type'] as String? ?? 'connection.error',
diff --git a/packages/stream_feeds_test/analysis_options.yaml b/packages/stream_feeds_test/analysis_options.yaml
index 192f3dbb..37426d2f 100644
--- a/packages/stream_feeds_test/analysis_options.yaml
+++ b/packages/stream_feeds_test/analysis_options.yaml
@@ -1,6 +1,8 @@
 include: ../../analysis_options.yaml
 
 analyzer:
+  exclude:
+    - build/**
   errors:
     # Allow accessing @internal and @visibleForTesting members in test utilities
     invalid_use_of_internal_member: ignore
diff --git a/packages/stream_feeds_test/lib/src/helpers/test_data.dart b/packages/stream_feeds_test/lib/src/helpers/test_data.dart
index b095ceb5..313011aa 100644
--- a/packages/stream_feeds_test/lib/src/helpers/test_data.dart
+++ b/packages/stream_feeds_test/lib/src/helpers/test_data.dart
@@ -263,7 +263,7 @@ FeedResponse createDefaultFeedResponse({
   int activityCount = 0,
   int followerCount = 0,
   int followingCount = 0,
-  List<FeedResponseOwnCapabilities>? ownCapabilities,
+  List<FeedOwnCapability>? ownCapabilities,
   FeedMemberResponse? ownMembership,
   List<FollowResponse>? ownFollowings,
   List<FollowResponse>? ownFollows,
diff --git a/sample_app/analysis_options.yaml b/sample_app/analysis_options.yaml
index f031fcbe..fde22e38 100644
--- a/sample_app/analysis_options.yaml
+++ b/sample_app/analysis_options.yaml
@@ -3,6 +3,7 @@ include: ../analysis_options.yaml
 analyzer:
   # TODO: not working if added on the root analysis file
   exclude:
+    - build/**
     # exclude all the generated files
     - lib/**/*.*.dart
     - lib/firebase_options.dart