diff --git a/packages/dynamite/dynamite/lib/src/openapi_builder.dart b/packages/dynamite/dynamite/lib/src/openapi_builder.dart
index 9f74a174..7a9ed929 100644
--- a/packages/dynamite/dynamite/lib/src/openapi_builder.dart
+++ b/packages/dynamite/dynamite/lib/src/openapi_builder.dart
@@ -415,8 +415,6 @@ class OpenAPIBuilder implements Builder {
                                 nullable: dartParameterNullable,
                               ).dartType;
 
-                              state.resolvedTypeCombinations.add(result);
-
                               if (result.name == 'String') {
                                 if (parameter.schema?.pattern != null) {
                                   code.write('''
@@ -621,7 +619,6 @@ class OpenAPIBuilder implements Builder {
                                       ),
                                       mediaType.schema!,
                                     );
-                                    state.resolvedTypeCombinations.add(result);
 
                                     if (mimeType == '*/*' ||
                                         mimeType == 'application/octet-stream' ||
@@ -713,17 +710,10 @@ class OpenAPIBuilder implements Builder {
 
       output.addAll(state.output.map((final e) => e.accept(emitter).toString()));
 
-      if (state.registeredJsonObjects.isNotEmpty) {
+      if (state.resolvedTypes.isNotEmpty) {
         output.addAll([
-          '@SerializersFor(const [',
-          for (final name in state.registeredJsonObjects) ...[
-            '$name,',
-          ],
-          '])',
-          r'final Serializers _serializers = (_$_serializers.toBuilder()',
-          for (final type in state.resolvedTypeCombinations) ...[
-            ...type.builderFactories,
-          ],
+          'final Serializers _serializers = (Serializers().toBuilder()',
+          ...state.resolvedTypes.map((final type) => type.serializers).expand((final element) => element).toSet(),
           ').build();',
           '',
           'Serializers get ${variablePrefix}Serializers => _serializers;',
@@ -933,10 +923,8 @@ class State {
   State(this.prefix);
 
   final String prefix;
-  final resolvedTypes = <String>{};
-  final registeredJsonObjects = <String>{};
   final output = <Spec>[];
-  final resolvedTypeCombinations = <TypeResult>{};
+  final resolvedTypes = <TypeResult>{};
 }
 
 TypeResult resolveObject(
@@ -948,9 +936,7 @@ TypeResult resolveObject(
   final bool nullable = false,
   final bool isHeader = false,
 }) {
-  if (!state.resolvedTypes.contains('${state.prefix}$identifier')) {
-    state.resolvedTypes.add('${state.prefix}$identifier');
-    state.registeredJsonObjects.add('${state.prefix}$identifier');
+  if (state.resolvedTypes.add(TypeResultObject('${state.prefix}$identifier'))) {
     state.output.add(
       Class(
         (final b) {
@@ -1277,8 +1263,7 @@ TypeResult resolveType(
       nullable: nullable,
     );
   } else if (schema.ofs != null) {
-    if (!state.resolvedTypes.contains('${state.prefix}$identifier')) {
-      state.resolvedTypes.add('${state.prefix}$identifier');
+    if (state.resolvedTypes.add(TypeResultObject('${state.prefix}$identifier'))) {
       final results = schema.ofs!
           .map(
             (final s) => resolveType(
@@ -1668,8 +1653,7 @@ TypeResult resolveType(
 
   if (result != null) {
     if (!ignoreEnum && schema.enum_ != null) {
-      if (!state.resolvedTypes.contains('${state.prefix}$identifier')) {
-        state.resolvedTypes.add('${state.prefix}$identifier');
+      if (state.resolvedTypes.add(TypeResultEnum('${state.prefix}$identifier', result))) {
         state.output.add(
           Class(
             (final b) => b
@@ -1773,6 +1757,7 @@ TypeResult resolveType(
       );
     }
 
+    state.resolvedTypes.add(result);
     return result;
   }
 
diff --git a/packages/dynamite/dynamite/lib/src/type_result/base.dart b/packages/dynamite/dynamite/lib/src/type_result/base.dart
index 08a006ba..13c2218e 100644
--- a/packages/dynamite/dynamite/lib/src/type_result/base.dart
+++ b/packages/dynamite/dynamite/lib/src/type_result/base.dart
@@ -10,6 +10,9 @@ class TypeResultBase extends TypeResult {
   @override
   String? get _builderFactory => null;
 
+  @override
+  String? get _serializer => null;
+
   @override
   String serialize(final String object) => object;
 
diff --git a/packages/dynamite/dynamite/lib/src/type_result/enum.dart b/packages/dynamite/dynamite/lib/src/type_result/enum.dart
index 7ef627a0..8f2cc279 100644
--- a/packages/dynamite/dynamite/lib/src/type_result/enum.dart
+++ b/packages/dynamite/dynamite/lib/src/type_result/enum.dart
@@ -13,6 +13,9 @@ class TypeResultEnum extends TypeResult {
   @override
   String? get _builderFactory => null;
 
+  @override
+  String? get _serializer => '..add($className.serializer)';
+
   @override
   String encode(
     final String object, {
diff --git a/packages/dynamite/dynamite/lib/src/type_result/list.dart b/packages/dynamite/dynamite/lib/src/type_result/list.dart
index 2034436e..a3ce03ce 100644
--- a/packages/dynamite/dynamite/lib/src/type_result/list.dart
+++ b/packages/dynamite/dynamite/lib/src/type_result/list.dart
@@ -13,6 +13,9 @@ class TypeResultList extends TypeResult {
   @override
   String? get _builderFactory => '..addBuilderFactory($fullType, ListBuilder<${subType.className}>.new)';
 
+  @override
+  String? get _serializer => null;
+
   @override
   String encode(
     final String object, {
diff --git a/packages/dynamite/dynamite/lib/src/type_result/map.dart b/packages/dynamite/dynamite/lib/src/type_result/map.dart
index 0050354d..7ae50130 100644
--- a/packages/dynamite/dynamite/lib/src/type_result/map.dart
+++ b/packages/dynamite/dynamite/lib/src/type_result/map.dart
@@ -13,6 +13,9 @@ class TypeResultMap extends TypeResult {
   @override
   String? get _builderFactory => '..addBuilderFactory($fullType, MapBuilder<String, ${subType.className}>.new)';
 
+  @override
+  String? get _serializer => null;
+
   @override
   TypeResultMap get dartType => TypeResultMap('Map', subType, nullable: nullable);
 
diff --git a/packages/dynamite/dynamite/lib/src/type_result/object.dart b/packages/dynamite/dynamite/lib/src/type_result/object.dart
index b6f94bc3..830f91a7 100644
--- a/packages/dynamite/dynamite/lib/src/type_result/object.dart
+++ b/packages/dynamite/dynamite/lib/src/type_result/object.dart
@@ -16,6 +16,9 @@ class TypeResultObject extends TypeResult {
   @override
   String? get _builderFactory => '..addBuilderFactory($fullType, $name.new)';
 
+  @override
+  String? get _serializer => '..add($className.serializer)';
+
   @override
   String encode(
     final String object, {
diff --git a/packages/dynamite/dynamite/lib/src/type_result/type_result.dart b/packages/dynamite/dynamite/lib/src/type_result/type_result.dart
index 7dbf1cd8..021b0d93 100644
--- a/packages/dynamite/dynamite/lib/src/type_result/type_result.dart
+++ b/packages/dynamite/dynamite/lib/src/type_result/type_result.dart
@@ -43,14 +43,20 @@ abstract class TypeResult {
     return 'FullType($className)';
   }
 
-  List<String> get builderFactories => [
-        for (final class_ in generics) ...[
-          ...class_.builderFactories,
-        ],
-        if (_builderFactory != null) ...[
-          _builderFactory!,
-        ],
-      ];
+  Iterable<String> get serializers sync* {
+    for (final class_ in generics) {
+      yield* class_.serializers;
+    }
+
+    if (_builderFactory != null) {
+      yield _builderFactory!;
+    }
+    if (_serializer != null) {
+      yield _serializer!;
+    }
+  }
+
+  String? get _serializer;
 
   String? get _builderFactory;
 
diff --git a/packages/dynamite/dynamite_runtime/.gitignore b/packages/dynamite/dynamite_runtime/.gitignore
index 3cceda55..e3ce1c0a 100644
--- a/packages/dynamite/dynamite_runtime/.gitignore
+++ b/packages/dynamite/dynamite_runtime/.gitignore
@@ -1,6 +1,7 @@
 # https://dart.dev/guides/libraries/private-files
 # Created by `dart pub`
 .dart_tool/
+build/
 
 # Avoid committing pubspec.lock for library packages; see
 # https://dart.dev/guides/libraries/private-files#pubspeclock.
diff --git a/packages/nextcloud/lib/src/api/core.openapi.dart b/packages/nextcloud/lib/src/api/core.openapi.dart
index df54e15f..66a74aa0 100644
--- a/packages/nextcloud/lib/src/api/core.openapi.dart
+++ b/packages/nextcloud/lib/src/api/core.openapi.dart
@@ -2036,99 +2036,339 @@ abstract class CoreEmptyOCS implements Built<CoreEmptyOCS, CoreEmptyOCSBuilder>
   static Serializer<CoreEmptyOCS> get serializer => _$coreEmptyOCSSerializer;
 }
 
-@SerializersFor([
-  CoreServerStatus,
-  CoreServerCapabilities,
-  CoreServerCapabilities_Ocs,
-  CoreOCSMeta,
-  CoreServerCapabilities_Ocs_Data,
-  CoreServerCapabilities_Ocs_Data_Version,
-  CoreServerCapabilities_Ocs_Data_Capabilities,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Core,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Bruteforce,
-  CoreServerCapabilities_Ocs_Data_Capabilities_MetadataAvailable,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Files,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Files_DirectEditing,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Activity,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Circles,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Status,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Settings,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle_Constants,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle_Constants_Source,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle_Config,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Member,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Member_Constants,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Ocm,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Ocm_ResourceTypes,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Ocm_ResourceTypes_Protocols,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Dav,
-  CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing,
-  CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public,
-  CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_Password,
-  CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_ExpireDate,
-  CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_ExpireDateInternal,
-  CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_ExpireDateRemote,
-  CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_User,
-  CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_User_ExpireDate,
-  CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Group,
-  CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Group_ExpireDate,
-  CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Federation,
-  CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Federation_ExpireDate,
-  CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Federation_ExpireDateSupported,
-  CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharee,
-  CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail,
-  CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail_UploadFilesDrop,
-  CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail_Password,
-  CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail_ExpireDate,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Notes,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Notifications,
-  CoreServerCapabilities_Ocs_Data_Capabilities_PasswordPolicy,
-  CoreServerCapabilities_Ocs_Data_Capabilities_PasswordPolicy_Api,
-  CoreServerCapabilities_Ocs_Data_Capabilities_ProvisioningApi,
-  CoreServerCapabilities_Ocs_Data_Capabilities_Theming,
-  CoreServerCapabilities_Ocs_Data_Capabilities_UserStatus,
-  CoreServerCapabilities_Ocs_Data_Capabilities_WeatherStatus,
-  CoreNavigationApps,
-  CoreNavigationApps_Ocs,
-  CoreNavigationApps_Ocs_Data,
-  CoreLoginFlowInit,
-  CoreLoginFlowInit_Poll,
-  CoreLoginFlowResult,
-  CoreAutocompleteResult,
-  CoreAutocompleteResult_Ocs,
-  CoreAutocompleteResult_Ocs_Data,
-  CoreUnifiedSearchProvidersResponse200ApplicationJson,
-  CoreUnifiedSearchProvidersResponse200ApplicationJson_Ocs,
-  CoreUnifiedSearchProvider,
-  CoreUnifiedSearchResponse200ApplicationJson,
-  CoreUnifiedSearchResponse200ApplicationJson_Ocs,
-  CoreUnifiedSearchResult,
-  CoreUnifiedSearchResultEntry,
-  CoreEmptyOCS,
-  CoreEmptyOCS_Ocs,
-])
-final Serializers _serializers = (_$_serializers.toBuilder()
+final Serializers _serializers = (Serializers().toBuilder()
       ..addBuilderFactory(const FullType(CoreServerStatus), CoreServerStatus.new)
+      ..add(CoreServerStatus.serializer)
       ..addBuilderFactory(const FullType(CoreServerCapabilities), CoreServerCapabilities.new)
+      ..add(CoreServerCapabilities.serializer)
+      ..addBuilderFactory(const FullType(CoreServerCapabilities_Ocs), CoreServerCapabilities_Ocs.new)
+      ..add(CoreServerCapabilities_Ocs.serializer)
+      ..addBuilderFactory(const FullType(CoreOCSMeta), CoreOCSMeta.new)
+      ..add(CoreOCSMeta.serializer)
+      ..addBuilderFactory(const FullType(CoreServerCapabilities_Ocs_Data), CoreServerCapabilities_Ocs_Data.new)
+      ..add(CoreServerCapabilities_Ocs_Data.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Version),
+        CoreServerCapabilities_Ocs_Data_Version.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Version.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities),
+        CoreServerCapabilities_Ocs_Data_Capabilities.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Core),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Core.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Core.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Bruteforce),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Bruteforce.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Bruteforce.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_MetadataAvailable),
+        CoreServerCapabilities_Ocs_Data_Capabilities_MetadataAvailable.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_MetadataAvailable.serializer)
+      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), ListBuilder<String>.new)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Files),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Files.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Files.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Files_DirectEditing),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Files_DirectEditing.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Files_DirectEditing.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Activity),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Activity.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Activity.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Circles),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Circles.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Circles.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Status),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Status.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Status.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Settings),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Settings.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Settings.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle_Constants),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle_Constants.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle_Constants.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle_Constants_Source),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle_Constants_Source.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle_Constants_Source.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle_Config),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle_Config.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle_Config.serializer)
+      ..addBuilderFactory(const FullType(BuiltList, [FullType(int)]), ListBuilder<int>.new)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Member),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Member.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Member.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Member_Constants),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Member_Constants.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Member_Constants.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Ocm),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Ocm.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Ocm.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Ocm_ResourceTypes),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Ocm_ResourceTypes.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Ocm_ResourceTypes.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Ocm_ResourceTypes_Protocols),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Ocm_ResourceTypes_Protocols.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Ocm_ResourceTypes_Protocols.serializer)
+      ..addBuilderFactory(
+        const FullType(BuiltList, [FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Ocm_ResourceTypes)]),
+        ListBuilder<CoreServerCapabilities_Ocs_Data_Capabilities_Ocm_ResourceTypes>.new,
+      )
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Dav),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Dav.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Dav.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing),
+        CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public),
+        CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_Password),
+        CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_Password.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_Password.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_ExpireDate),
+        CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_ExpireDate.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_ExpireDate.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_ExpireDateInternal),
+        CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_ExpireDateInternal.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_ExpireDateInternal.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_ExpireDateRemote),
+        CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_ExpireDateRemote.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_ExpireDateRemote.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_User),
+        CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_User.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_User.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_User_ExpireDate),
+        CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_User_ExpireDate.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_User_ExpireDate.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Group),
+        CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Group.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Group.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Group_ExpireDate),
+        CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Group_ExpireDate.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Group_ExpireDate.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Federation),
+        CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Federation.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Federation.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Federation_ExpireDate),
+        CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Federation_ExpireDate.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Federation_ExpireDate.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Federation_ExpireDateSupported),
+        CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Federation_ExpireDateSupported.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Federation_ExpireDateSupported.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharee),
+        CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharee.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharee.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail),
+        CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail_UploadFilesDrop),
+        CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail_UploadFilesDrop.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail_UploadFilesDrop.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail_Password),
+        CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail_Password.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail_Password.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail_ExpireDate),
+        CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail_ExpireDate.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail_ExpireDate.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Notes),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Notes.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Notes.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Notifications),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Notifications.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Notifications.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_PasswordPolicy),
+        CoreServerCapabilities_Ocs_Data_Capabilities_PasswordPolicy.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_PasswordPolicy.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_PasswordPolicy_Api),
+        CoreServerCapabilities_Ocs_Data_Capabilities_PasswordPolicy_Api.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_PasswordPolicy_Api.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_ProvisioningApi),
+        CoreServerCapabilities_Ocs_Data_Capabilities_ProvisioningApi.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_ProvisioningApi.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Theming),
+        CoreServerCapabilities_Ocs_Data_Capabilities_Theming.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Theming.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_UserStatus),
+        CoreServerCapabilities_Ocs_Data_Capabilities_UserStatus.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_UserStatus.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreServerCapabilities_Ocs_Data_Capabilities_WeatherStatus),
+        CoreServerCapabilities_Ocs_Data_Capabilities_WeatherStatus.new,
+      )
+      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_WeatherStatus.serializer)
       ..addBuilderFactory(const FullType(CoreNavigationApps), CoreNavigationApps.new)
+      ..add(CoreNavigationApps.serializer)
+      ..addBuilderFactory(const FullType(CoreNavigationApps_Ocs), CoreNavigationApps_Ocs.new)
+      ..add(CoreNavigationApps_Ocs.serializer)
+      ..addBuilderFactory(const FullType(CoreNavigationApps_Ocs_Data), CoreNavigationApps_Ocs_Data.new)
+      ..add(CoreNavigationApps_Ocs_Data.serializer)
+      ..addBuilderFactory(const FullType(CoreNavigationApps_Ocs_Data_Order), CoreNavigationApps_Ocs_Data_Order.new)
+      ..add(CoreNavigationApps_Ocs_Data_Order.serializer)
+      ..addBuilderFactory(
+        const FullType(BuiltList, [FullType(CoreNavigationApps_Ocs_Data)]),
+        ListBuilder<CoreNavigationApps_Ocs_Data>.new,
+      )
       ..addBuilderFactory(const FullType(CoreLoginFlowInit), CoreLoginFlowInit.new)
+      ..add(CoreLoginFlowInit.serializer)
+      ..addBuilderFactory(const FullType(CoreLoginFlowInit_Poll), CoreLoginFlowInit_Poll.new)
+      ..add(CoreLoginFlowInit_Poll.serializer)
       ..addBuilderFactory(const FullType(CoreLoginFlowResult), CoreLoginFlowResult.new)
-      ..addBuilderFactory(const FullType(List, [FullType(int)]), ListBuilder<int>.new)
+      ..add(CoreLoginFlowResult.serializer)
       ..addBuilderFactory(const FullType(CoreAutocompleteResult), CoreAutocompleteResult.new)
+      ..add(CoreAutocompleteResult.serializer)
+      ..addBuilderFactory(const FullType(CoreAutocompleteResult_Ocs), CoreAutocompleteResult_Ocs.new)
+      ..add(CoreAutocompleteResult_Ocs.serializer)
+      ..addBuilderFactory(const FullType(CoreAutocompleteResult_Ocs_Data), CoreAutocompleteResult_Ocs_Data.new)
+      ..add(CoreAutocompleteResult_Ocs_Data.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreAutocompleteResult_Ocs_Data_Status),
+        CoreAutocompleteResult_Ocs_Data_Status.new,
+      )
+      ..add(CoreAutocompleteResult_Ocs_Data_Status.serializer)
+      ..addBuilderFactory(const FullType(BuiltList, [FullType(JsonObject)]), ListBuilder<JsonObject>.new)
+      ..addBuilderFactory(
+        const FullType(BuiltList, [FullType(CoreAutocompleteResult_Ocs_Data)]),
+        ListBuilder<CoreAutocompleteResult_Ocs_Data>.new,
+      )
       ..addBuilderFactory(
         const FullType(CoreUnifiedSearchProvidersResponse200ApplicationJson),
         CoreUnifiedSearchProvidersResponse200ApplicationJson.new,
       )
+      ..add(CoreUnifiedSearchProvidersResponse200ApplicationJson.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreUnifiedSearchProvidersResponse200ApplicationJson_Ocs),
+        CoreUnifiedSearchProvidersResponse200ApplicationJson_Ocs.new,
+      )
+      ..add(CoreUnifiedSearchProvidersResponse200ApplicationJson_Ocs.serializer)
+      ..addBuilderFactory(const FullType(CoreUnifiedSearchProvider), CoreUnifiedSearchProvider.new)
+      ..add(CoreUnifiedSearchProvider.serializer)
+      ..addBuilderFactory(
+        const FullType(BuiltList, [FullType(CoreUnifiedSearchProvider)]),
+        ListBuilder<CoreUnifiedSearchProvider>.new,
+      )
       ..addBuilderFactory(const FullType(CoreUnifiedSearchCursor), CoreUnifiedSearchCursor.new)
+      ..add(CoreUnifiedSearchCursor.serializer)
       ..addBuilderFactory(
         const FullType(ContentString, [FullType(CoreUnifiedSearchCursor)]),
         ContentString<CoreUnifiedSearchCursor>.new,
       )
+      ..add(ContentString.serializer)
       ..addBuilderFactory(
         const FullType(CoreUnifiedSearchResponse200ApplicationJson),
         CoreUnifiedSearchResponse200ApplicationJson.new,
-      ))
+      )
+      ..add(CoreUnifiedSearchResponse200ApplicationJson.serializer)
+      ..addBuilderFactory(
+        const FullType(CoreUnifiedSearchResponse200ApplicationJson_Ocs),
+        CoreUnifiedSearchResponse200ApplicationJson_Ocs.new,
+      )
+      ..add(CoreUnifiedSearchResponse200ApplicationJson_Ocs.serializer)
+      ..addBuilderFactory(const FullType(CoreUnifiedSearchResult), CoreUnifiedSearchResult.new)
+      ..add(CoreUnifiedSearchResult.serializer)
+      ..addBuilderFactory(const FullType(CoreUnifiedSearchResultEntry), CoreUnifiedSearchResultEntry.new)
+      ..add(CoreUnifiedSearchResultEntry.serializer)
+      ..addBuilderFactory(
+        const FullType(BuiltList, [FullType(CoreUnifiedSearchResultEntry)]),
+        ListBuilder<CoreUnifiedSearchResultEntry>.new,
+      )
+      ..addBuilderFactory(const FullType(CoreUnifiedSearchResult_Cursor), CoreUnifiedSearchResult_Cursor.new)
+      ..add(CoreUnifiedSearchResult_Cursor.serializer)
+      ..addBuilderFactory(const FullType(CoreEmptyOCS), CoreEmptyOCS.new)
+      ..add(CoreEmptyOCS.serializer)
+      ..addBuilderFactory(const FullType(CoreEmptyOCS_Ocs), CoreEmptyOCS_Ocs.new)
+      ..add(CoreEmptyOCS_Ocs.serializer))
     .build();
 
 Serializers get coreSerializers => _serializers;
diff --git a/packages/nextcloud/lib/src/api/core.openapi.g.dart b/packages/nextcloud/lib/src/api/core.openapi.g.dart
index b1262a1a..2e42071f 100644
--- a/packages/nextcloud/lib/src/api/core.openapi.g.dart
+++ b/packages/nextcloud/lib/src/api/core.openapi.g.dart
@@ -6,106 +6,6 @@ part of 'core.openapi.dart';
 // BuiltValueGenerator
 // **************************************************************************
 
-Serializers _$_serializers = (Serializers().toBuilder()
-      ..add(CoreAutocompleteResult.serializer)
-      ..add(CoreAutocompleteResult_Ocs.serializer)
-      ..add(CoreAutocompleteResult_Ocs_Data.serializer)
-      ..add(CoreAutocompleteResult_Ocs_Data_Status.serializer)
-      ..add(CoreEmptyOCS.serializer)
-      ..add(CoreEmptyOCS_Ocs.serializer)
-      ..add(CoreLoginFlowInit.serializer)
-      ..add(CoreLoginFlowInit_Poll.serializer)
-      ..add(CoreLoginFlowResult.serializer)
-      ..add(CoreNavigationApps.serializer)
-      ..add(CoreNavigationApps_Ocs.serializer)
-      ..add(CoreNavigationApps_Ocs_Data.serializer)
-      ..add(CoreNavigationApps_Ocs_Data_Order.serializer)
-      ..add(CoreOCSMeta.serializer)
-      ..add(CoreServerCapabilities.serializer)
-      ..add(CoreServerCapabilities_Ocs.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Activity.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Bruteforce.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Circles.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle_Config.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle_Constants.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Circle_Constants_Source.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Member.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Member_Constants.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Settings.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Circles_Status.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Core.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Dav.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Files.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Federation.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Federation_ExpireDate.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Federation_ExpireDateSupported.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Group.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Group_ExpireDate.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_ExpireDate.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_ExpireDateInternal.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_ExpireDateRemote.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Public_Password.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail_ExpireDate.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail_Password.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharebymail_UploadFilesDrop.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_Sharee.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_User.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_FilesSharing_User_ExpireDate.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Files_DirectEditing.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_MetadataAvailable.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Notes.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Notifications.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Ocm.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Ocm_ResourceTypes.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Ocm_ResourceTypes_Protocols.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_PasswordPolicy.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_PasswordPolicy_Api.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_ProvisioningApi.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_Theming.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_UserStatus.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Capabilities_WeatherStatus.serializer)
-      ..add(CoreServerCapabilities_Ocs_Data_Version.serializer)
-      ..add(CoreServerStatus.serializer)
-      ..add(CoreUnifiedSearchProvider.serializer)
-      ..add(CoreUnifiedSearchProvidersResponse200ApplicationJson.serializer)
-      ..add(CoreUnifiedSearchProvidersResponse200ApplicationJson_Ocs.serializer)
-      ..add(CoreUnifiedSearchResponse200ApplicationJson.serializer)
-      ..add(CoreUnifiedSearchResponse200ApplicationJson_Ocs.serializer)
-      ..add(CoreUnifiedSearchResult.serializer)
-      ..add(CoreUnifiedSearchResultEntry.serializer)
-      ..add(CoreUnifiedSearchResult_Cursor.serializer)
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(CoreAutocompleteResult_Ocs_Data)]),
-          () => ListBuilder<CoreAutocompleteResult_Ocs_Data>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(CoreNavigationApps_Ocs_Data)]),
-          () => ListBuilder<CoreNavigationApps_Ocs_Data>())
-      ..addBuilderFactory(
-          const FullType(BuiltList, [FullType(CoreServerCapabilities_Ocs_Data_Capabilities_Ocm_ResourceTypes)]),
-          () => ListBuilder<CoreServerCapabilities_Ocs_Data_Capabilities_Ocm_ResourceTypes>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(CoreUnifiedSearchProvider)]),
-          () => ListBuilder<CoreUnifiedSearchProvider>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(CoreUnifiedSearchResultEntry)]),
-          () => ListBuilder<CoreUnifiedSearchResultEntry>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(JsonObject)]), () => ListBuilder<JsonObject>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(JsonObject)]), () => ListBuilder<JsonObject>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), () => ListBuilder<String>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), () => ListBuilder<String>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), () => ListBuilder<String>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), () => ListBuilder<String>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), () => ListBuilder<String>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), () => ListBuilder<String>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), () => ListBuilder<String>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), () => ListBuilder<String>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), () => ListBuilder<String>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), () => ListBuilder<String>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(int)]), () => ListBuilder<int>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(int)]), () => ListBuilder<int>()))
-    .build();
 Serializer<CoreServerStatus> _$coreServerStatusSerializer = _$CoreServerStatusSerializer();
 Serializer<CoreOCSMeta> _$coreOCSMetaSerializer = _$CoreOCSMetaSerializer();
 Serializer<CoreServerCapabilities_Ocs_Data_Version> _$coreServerCapabilitiesOcsDataVersionSerializer =
diff --git a/packages/nextcloud/lib/src/api/news.openapi.dart b/packages/nextcloud/lib/src/api/news.openapi.dart
index 081c6986..ec914efb 100644
--- a/packages/nextcloud/lib/src/api/news.openapi.dart
+++ b/packages/nextcloud/lib/src/api/news.openapi.dart
@@ -731,23 +731,32 @@ abstract class NewsEmptyOCS implements Built<NewsEmptyOCS, NewsEmptyOCSBuilder>
   static Serializer<NewsEmptyOCS> get serializer => _$newsEmptyOCSSerializer;
 }
 
-@SerializersFor([
-  NewsSupportedAPIVersions,
-  NewsListFolders,
-  NewsFolder,
-  NewsFeed,
-  NewsArticle,
-  NewsListFeeds,
-  NewsListArticles,
-  NewsOCSMeta,
-  NewsEmptyOCS,
-  NewsEmptyOCS_Ocs,
-])
-final Serializers _serializers = (_$_serializers.toBuilder()
+final Serializers _serializers = (Serializers().toBuilder()
       ..addBuilderFactory(const FullType(NewsSupportedAPIVersions), NewsSupportedAPIVersions.new)
+      ..add(NewsSupportedAPIVersions.serializer)
+      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), ListBuilder<String>.new)
       ..addBuilderFactory(const FullType(NewsListFolders), NewsListFolders.new)
+      ..add(NewsListFolders.serializer)
+      ..addBuilderFactory(const FullType(NewsFolder), NewsFolder.new)
+      ..add(NewsFolder.serializer)
+      ..addBuilderFactory(const FullType(NewsFeed), NewsFeed.new)
+      ..add(NewsFeed.serializer)
+      ..addBuilderFactory(const FullType(NewsArticle), NewsArticle.new)
+      ..add(NewsArticle.serializer)
+      ..addBuilderFactory(const FullType(BuiltList, [FullType(NewsArticle)]), ListBuilder<NewsArticle>.new)
+      ..addBuilderFactory(const FullType(BuiltList, [FullType(NewsFeed)]), ListBuilder<NewsFeed>.new)
+      ..addBuilderFactory(const FullType(BuiltList, [FullType(NewsFolder)]), ListBuilder<NewsFolder>.new)
       ..addBuilderFactory(const FullType(NewsListFeeds), NewsListFeeds.new)
-      ..addBuilderFactory(const FullType(NewsListArticles), NewsListArticles.new))
+      ..add(NewsListFeeds.serializer)
+      ..addBuilderFactory(const FullType(NewsListArticles), NewsListArticles.new)
+      ..add(NewsListArticles.serializer)
+      ..addBuilderFactory(const FullType(NewsOCSMeta), NewsOCSMeta.new)
+      ..add(NewsOCSMeta.serializer)
+      ..addBuilderFactory(const FullType(NewsEmptyOCS), NewsEmptyOCS.new)
+      ..add(NewsEmptyOCS.serializer)
+      ..addBuilderFactory(const FullType(NewsEmptyOCS_Ocs), NewsEmptyOCS_Ocs.new)
+      ..add(NewsEmptyOCS_Ocs.serializer)
+      ..addBuilderFactory(const FullType(BuiltList, [FullType(JsonObject)]), ListBuilder<JsonObject>.new))
     .build();
 
 Serializers get newsSerializers => _serializers;
diff --git a/packages/nextcloud/lib/src/api/news.openapi.g.dart b/packages/nextcloud/lib/src/api/news.openapi.g.dart
index 6ac468b3..bdc2b26f 100644
--- a/packages/nextcloud/lib/src/api/news.openapi.g.dart
+++ b/packages/nextcloud/lib/src/api/news.openapi.g.dart
@@ -6,25 +6,6 @@ part of 'news.openapi.dart';
 // BuiltValueGenerator
 // **************************************************************************
 
-Serializers _$_serializers = (Serializers().toBuilder()
-      ..add(NewsArticle.serializer)
-      ..add(NewsEmptyOCS.serializer)
-      ..add(NewsEmptyOCS_Ocs.serializer)
-      ..add(NewsFeed.serializer)
-      ..add(NewsFolder.serializer)
-      ..add(NewsListArticles.serializer)
-      ..add(NewsListFeeds.serializer)
-      ..add(NewsListFolders.serializer)
-      ..add(NewsOCSMeta.serializer)
-      ..add(NewsSupportedAPIVersions.serializer)
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(JsonObject)]), () => ListBuilder<JsonObject>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(NewsArticle)]), () => ListBuilder<NewsArticle>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(NewsArticle)]), () => ListBuilder<NewsArticle>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(NewsFeed)]), () => ListBuilder<NewsFeed>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(NewsFeed)]), () => ListBuilder<NewsFeed>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(NewsFolder)]), () => ListBuilder<NewsFolder>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), () => ListBuilder<String>()))
-    .build();
 Serializer<NewsSupportedAPIVersions> _$newsSupportedAPIVersionsSerializer = _$NewsSupportedAPIVersionsSerializer();
 Serializer<NewsArticle> _$newsArticleSerializer = _$NewsArticleSerializer();
 Serializer<NewsFeed> _$newsFeedSerializer = _$NewsFeedSerializer();
diff --git a/packages/nextcloud/lib/src/api/notes.openapi.dart b/packages/nextcloud/lib/src/api/notes.openapi.dart
index 698ee4b7..859b31ea 100644
--- a/packages/nextcloud/lib/src/api/notes.openapi.dart
+++ b/packages/nextcloud/lib/src/api/notes.openapi.dart
@@ -427,18 +427,20 @@ abstract class NotesEmptyOCS implements Built<NotesEmptyOCS, NotesEmptyOCSBuilde
   static Serializer<NotesEmptyOCS> get serializer => _$notesEmptyOCSSerializer;
 }
 
-@SerializersFor([
-  NotesNote,
-  NotesSettings,
-  NotesOCSMeta,
-  NotesEmptyOCS,
-  NotesEmptyOCS_Ocs,
-])
-final Serializers _serializers = (_$_serializers.toBuilder()
+final Serializers _serializers = (Serializers().toBuilder()
       ..addBuilderFactory(const FullType(NotesNote), NotesNote.new)
+      ..add(NotesNote.serializer)
       ..addBuilderFactory(const FullType(BuiltList, [FullType(NotesNote)]), ListBuilder<NotesNote>.new)
-      ..addBuilderFactory(const FullType(NotesNote), NotesNote.new)
-      ..addBuilderFactory(const FullType(NotesSettings), NotesSettings.new))
+      ..addBuilderFactory(const FullType(NotesSettings), NotesSettings.new)
+      ..add(NotesSettings.serializer)
+      ..add(NotesSettings_NoteMode.serializer)
+      ..addBuilderFactory(const FullType(NotesOCSMeta), NotesOCSMeta.new)
+      ..add(NotesOCSMeta.serializer)
+      ..addBuilderFactory(const FullType(NotesEmptyOCS), NotesEmptyOCS.new)
+      ..add(NotesEmptyOCS.serializer)
+      ..addBuilderFactory(const FullType(NotesEmptyOCS_Ocs), NotesEmptyOCS_Ocs.new)
+      ..add(NotesEmptyOCS_Ocs.serializer)
+      ..addBuilderFactory(const FullType(BuiltList, [FullType(JsonObject)]), ListBuilder<JsonObject>.new))
     .build();
 
 Serializers get notesSerializers => _serializers;
diff --git a/packages/nextcloud/lib/src/api/notes.openapi.g.dart b/packages/nextcloud/lib/src/api/notes.openapi.g.dart
index 0a8d3b6a..2e3b49b9 100644
--- a/packages/nextcloud/lib/src/api/notes.openapi.g.dart
+++ b/packages/nextcloud/lib/src/api/notes.openapi.g.dart
@@ -30,15 +30,6 @@ final BuiltSet<NotesSettings_NoteMode> _$notesSettingsNoteModeValues =
   _$notesSettingsNoteModeRich,
 ]);
 
-Serializers _$_serializers = (Serializers().toBuilder()
-      ..add(NotesEmptyOCS.serializer)
-      ..add(NotesEmptyOCS_Ocs.serializer)
-      ..add(NotesNote.serializer)
-      ..add(NotesOCSMeta.serializer)
-      ..add(NotesSettings.serializer)
-      ..add(NotesSettings_NoteMode.serializer)
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(JsonObject)]), () => ListBuilder<JsonObject>()))
-    .build();
 Serializer<NotesNote> _$notesNoteSerializer = _$NotesNoteSerializer();
 Serializer<NotesSettings_NoteMode> _$notesSettingsNoteModeSerializer = _$NotesSettings_NoteModeSerializer();
 Serializer<NotesSettings> _$notesSettingsSerializer = _$NotesSettingsSerializer();
diff --git a/packages/nextcloud/lib/src/api/notifications.openapi.dart b/packages/nextcloud/lib/src/api/notifications.openapi.dart
index ea37ef11..64a5b66a 100644
--- a/packages/nextcloud/lib/src/api/notifications.openapi.dart
+++ b/packages/nextcloud/lib/src/api/notifications.openapi.dart
@@ -496,26 +496,48 @@ abstract class NotificationsNotificationDecryptedSubject
       _$notificationsNotificationDecryptedSubjectSerializer;
 }
 
-@SerializersFor([
-  NotificationsListNotifications,
-  NotificationsListNotifications_Ocs,
-  NotificationsOCSMeta,
-  NotificationsNotification,
-  NotificationsNotificationAction,
-  NotificationsGetNotification,
-  NotificationsGetNotification_Ocs,
-  NotificationsEmptyOCS,
-  NotificationsEmptyOCS_Ocs,
-  NotificationsPushServerRegistration,
-  NotificationsPushServerRegistration_Ocs,
-  NotificationsPushServerSubscription,
-  NotificationsNotificationDecryptedSubject,
-])
-final Serializers _serializers = (_$_serializers.toBuilder()
+final Serializers _serializers = (Serializers().toBuilder()
       ..addBuilderFactory(const FullType(NotificationsListNotifications), NotificationsListNotifications.new)
+      ..add(NotificationsListNotifications.serializer)
+      ..addBuilderFactory(const FullType(NotificationsListNotifications_Ocs), NotificationsListNotifications_Ocs.new)
+      ..add(NotificationsListNotifications_Ocs.serializer)
+      ..addBuilderFactory(const FullType(NotificationsOCSMeta), NotificationsOCSMeta.new)
+      ..add(NotificationsOCSMeta.serializer)
+      ..addBuilderFactory(const FullType(NotificationsNotification), NotificationsNotification.new)
+      ..add(NotificationsNotification.serializer)
+      ..addBuilderFactory(const FullType(NotificationsNotificationAction), NotificationsNotificationAction.new)
+      ..add(NotificationsNotificationAction.serializer)
+      ..addBuilderFactory(
+        const FullType(BuiltList, [FullType(NotificationsNotificationAction)]),
+        ListBuilder<NotificationsNotificationAction>.new,
+      )
+      ..addBuilderFactory(
+        const FullType(BuiltList, [FullType(NotificationsNotification)]),
+        ListBuilder<NotificationsNotification>.new,
+      )
       ..addBuilderFactory(const FullType(NotificationsGetNotification), NotificationsGetNotification.new)
+      ..add(NotificationsGetNotification.serializer)
+      ..addBuilderFactory(const FullType(NotificationsGetNotification_Ocs), NotificationsGetNotification_Ocs.new)
+      ..add(NotificationsGetNotification_Ocs.serializer)
       ..addBuilderFactory(const FullType(NotificationsEmptyOCS), NotificationsEmptyOCS.new)
-      ..addBuilderFactory(const FullType(NotificationsPushServerRegistration), NotificationsPushServerRegistration.new))
+      ..add(NotificationsEmptyOCS.serializer)
+      ..addBuilderFactory(const FullType(NotificationsEmptyOCS_Ocs), NotificationsEmptyOCS_Ocs.new)
+      ..add(NotificationsEmptyOCS_Ocs.serializer)
+      ..addBuilderFactory(const FullType(BuiltList, [FullType(JsonObject)]), ListBuilder<JsonObject>.new)
+      ..addBuilderFactory(const FullType(NotificationsPushServerRegistration), NotificationsPushServerRegistration.new)
+      ..add(NotificationsPushServerRegistration.serializer)
+      ..addBuilderFactory(
+        const FullType(NotificationsPushServerRegistration_Ocs),
+        NotificationsPushServerRegistration_Ocs.new,
+      )
+      ..add(NotificationsPushServerRegistration_Ocs.serializer)
+      ..addBuilderFactory(const FullType(NotificationsPushServerSubscription), NotificationsPushServerSubscription.new)
+      ..add(NotificationsPushServerSubscription.serializer)
+      ..addBuilderFactory(
+        const FullType(NotificationsNotificationDecryptedSubject),
+        NotificationsNotificationDecryptedSubject.new,
+      )
+      ..add(NotificationsNotificationDecryptedSubject.serializer))
     .build();
 
 Serializers get notificationsSerializers => _serializers;
diff --git a/packages/nextcloud/lib/src/api/notifications.openapi.g.dart b/packages/nextcloud/lib/src/api/notifications.openapi.g.dart
index 41f28165..c1f510af 100644
--- a/packages/nextcloud/lib/src/api/notifications.openapi.g.dart
+++ b/packages/nextcloud/lib/src/api/notifications.openapi.g.dart
@@ -6,26 +6,6 @@ part of 'notifications.openapi.dart';
 // BuiltValueGenerator
 // **************************************************************************
 
-Serializers _$_serializers = (Serializers().toBuilder()
-      ..add(NotificationsEmptyOCS.serializer)
-      ..add(NotificationsEmptyOCS_Ocs.serializer)
-      ..add(NotificationsGetNotification.serializer)
-      ..add(NotificationsGetNotification_Ocs.serializer)
-      ..add(NotificationsListNotifications.serializer)
-      ..add(NotificationsListNotifications_Ocs.serializer)
-      ..add(NotificationsNotification.serializer)
-      ..add(NotificationsNotificationAction.serializer)
-      ..add(NotificationsNotificationDecryptedSubject.serializer)
-      ..add(NotificationsOCSMeta.serializer)
-      ..add(NotificationsPushServerRegistration.serializer)
-      ..add(NotificationsPushServerRegistration_Ocs.serializer)
-      ..add(NotificationsPushServerSubscription.serializer)
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(JsonObject)]), () => ListBuilder<JsonObject>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(NotificationsNotification)]),
-          () => ListBuilder<NotificationsNotification>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(NotificationsNotificationAction)]),
-          () => ListBuilder<NotificationsNotificationAction>()))
-    .build();
 Serializer<NotificationsOCSMeta> _$notificationsOCSMetaSerializer = _$NotificationsOCSMetaSerializer();
 Serializer<NotificationsNotificationAction> _$notificationsNotificationActionSerializer =
     _$NotificationsNotificationActionSerializer();
diff --git a/packages/nextcloud/lib/src/api/provisioning_api.openapi.dart b/packages/nextcloud/lib/src/api/provisioning_api.openapi.dart
index 756b2366..03e75ed2 100644
--- a/packages/nextcloud/lib/src/api/provisioning_api.openapi.dart
+++ b/packages/nextcloud/lib/src/api/provisioning_api.openapi.dart
@@ -288,18 +288,28 @@ abstract class ProvisioningApiEmptyOCS implements Built<ProvisioningApiEmptyOCS,
   static Serializer<ProvisioningApiEmptyOCS> get serializer => _$provisioningApiEmptyOCSSerializer;
 }
 
-@SerializersFor([
-  ProvisioningApiUser,
-  ProvisioningApiUser_Ocs,
-  ProvisioningApiOCSMeta,
-  ProvisioningApiUserDetails,
-  ProvisioningApiUserDetails_Quota,
-  ProvisioningApiUserDetails_BackendCapabilities,
-  ProvisioningApiEmptyOCS,
-  ProvisioningApiEmptyOCS_Ocs,
-])
-final Serializers _serializers = (_$_serializers.toBuilder()
-      ..addBuilderFactory(const FullType(ProvisioningApiUser), ProvisioningApiUser.new))
+final Serializers _serializers = (Serializers().toBuilder()
+      ..addBuilderFactory(const FullType(ProvisioningApiUser), ProvisioningApiUser.new)
+      ..add(ProvisioningApiUser.serializer)
+      ..addBuilderFactory(const FullType(ProvisioningApiUser_Ocs), ProvisioningApiUser_Ocs.new)
+      ..add(ProvisioningApiUser_Ocs.serializer)
+      ..addBuilderFactory(const FullType(ProvisioningApiOCSMeta), ProvisioningApiOCSMeta.new)
+      ..add(ProvisioningApiOCSMeta.serializer)
+      ..addBuilderFactory(const FullType(ProvisioningApiUserDetails), ProvisioningApiUserDetails.new)
+      ..add(ProvisioningApiUserDetails.serializer)
+      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), ListBuilder<String>.new)
+      ..addBuilderFactory(const FullType(ProvisioningApiUserDetails_Quota), ProvisioningApiUserDetails_Quota.new)
+      ..add(ProvisioningApiUserDetails_Quota.serializer)
+      ..addBuilderFactory(
+        const FullType(ProvisioningApiUserDetails_BackendCapabilities),
+        ProvisioningApiUserDetails_BackendCapabilities.new,
+      )
+      ..add(ProvisioningApiUserDetails_BackendCapabilities.serializer)
+      ..addBuilderFactory(const FullType(ProvisioningApiEmptyOCS), ProvisioningApiEmptyOCS.new)
+      ..add(ProvisioningApiEmptyOCS.serializer)
+      ..addBuilderFactory(const FullType(ProvisioningApiEmptyOCS_Ocs), ProvisioningApiEmptyOCS_Ocs.new)
+      ..add(ProvisioningApiEmptyOCS_Ocs.serializer)
+      ..addBuilderFactory(const FullType(BuiltList, [FullType(JsonObject)]), ListBuilder<JsonObject>.new))
     .build();
 
 Serializers get provisioningApiSerializers => _serializers;
diff --git a/packages/nextcloud/lib/src/api/provisioning_api.openapi.g.dart b/packages/nextcloud/lib/src/api/provisioning_api.openapi.g.dart
index 6e89ce57..2e1ad9a7 100644
--- a/packages/nextcloud/lib/src/api/provisioning_api.openapi.g.dart
+++ b/packages/nextcloud/lib/src/api/provisioning_api.openapi.g.dart
@@ -6,21 +6,6 @@ part of 'provisioning_api.openapi.dart';
 // BuiltValueGenerator
 // **************************************************************************
 
-Serializers _$_serializers = (Serializers().toBuilder()
-      ..add(ProvisioningApiEmptyOCS.serializer)
-      ..add(ProvisioningApiEmptyOCS_Ocs.serializer)
-      ..add(ProvisioningApiOCSMeta.serializer)
-      ..add(ProvisioningApiUser.serializer)
-      ..add(ProvisioningApiUserDetails.serializer)
-      ..add(ProvisioningApiUserDetails_BackendCapabilities.serializer)
-      ..add(ProvisioningApiUserDetails_Quota.serializer)
-      ..add(ProvisioningApiUser_Ocs.serializer)
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(JsonObject)]), () => ListBuilder<JsonObject>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), () => ListBuilder<String>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), () => ListBuilder<String>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), () => ListBuilder<String>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), () => ListBuilder<String>()))
-    .build();
 Serializer<ProvisioningApiOCSMeta> _$provisioningApiOCSMetaSerializer = _$ProvisioningApiOCSMetaSerializer();
 Serializer<ProvisioningApiUserDetails_Quota> _$provisioningApiUserDetailsQuotaSerializer =
     _$ProvisioningApiUserDetails_QuotaSerializer();
diff --git a/packages/nextcloud/lib/src/api/uppush.openapi.dart b/packages/nextcloud/lib/src/api/uppush.openapi.dart
index 6905b2e9..15d3eb70 100644
--- a/packages/nextcloud/lib/src/api/uppush.openapi.dart
+++ b/packages/nextcloud/lib/src/api/uppush.openapi.dart
@@ -622,66 +622,73 @@ abstract class UppushGatewayMatrixResponse200ApplicationJson
       _$uppushGatewayMatrixResponse200ApplicationJsonSerializer;
 }
 
-@SerializersFor([
-  UppushCheckResponse200ApplicationJson,
-  UppushSetKeepaliveResponse200ApplicationJson,
-  UppushCreateDeviceResponse200ApplicationJson,
-  UppushSyncDeviceResponse401ApplicationJson,
-  UppushDeleteDeviceResponse200ApplicationJson,
-  UppushCreateAppResponse200ApplicationJson,
-  UppushDeleteAppResponse200ApplicationJson,
-  UppushUnifiedpushDiscoveryResponse200ApplicationJson,
-  UppushUnifiedpushDiscoveryResponse200ApplicationJson_Unifiedpush,
-  UppushPushResponse201ApplicationJson,
-  UppushGatewayMatrixDiscoveryResponse200ApplicationJson,
-  UppushGatewayMatrixDiscoveryResponse200ApplicationJson_Unifiedpush,
-  UppushGatewayMatrixResponse200ApplicationJson,
-])
-final Serializers _serializers = (_$_serializers.toBuilder()
+final Serializers _serializers = (Serializers().toBuilder()
       ..addBuilderFactory(
         const FullType(UppushCheckResponse200ApplicationJson),
         UppushCheckResponse200ApplicationJson.new,
       )
+      ..add(UppushCheckResponse200ApplicationJson.serializer)
       ..addBuilderFactory(
         const FullType(UppushSetKeepaliveResponse200ApplicationJson),
         UppushSetKeepaliveResponse200ApplicationJson.new,
       )
+      ..add(UppushSetKeepaliveResponse200ApplicationJson.serializer)
       ..addBuilderFactory(
         const FullType(UppushCreateDeviceResponse200ApplicationJson),
         UppushCreateDeviceResponse200ApplicationJson.new,
       )
+      ..add(UppushCreateDeviceResponse200ApplicationJson.serializer)
       ..addBuilderFactory(
         const FullType(UppushSyncDeviceResponse401ApplicationJson),
         UppushSyncDeviceResponse401ApplicationJson.new,
       )
+      ..add(UppushSyncDeviceResponse401ApplicationJson.serializer)
       ..addBuilderFactory(
         const FullType(UppushDeleteDeviceResponse200ApplicationJson),
         UppushDeleteDeviceResponse200ApplicationJson.new,
       )
+      ..add(UppushDeleteDeviceResponse200ApplicationJson.serializer)
       ..addBuilderFactory(
         const FullType(UppushCreateAppResponse200ApplicationJson),
         UppushCreateAppResponse200ApplicationJson.new,
       )
+      ..add(UppushCreateAppResponse200ApplicationJson.serializer)
       ..addBuilderFactory(
         const FullType(UppushDeleteAppResponse200ApplicationJson),
         UppushDeleteAppResponse200ApplicationJson.new,
       )
+      ..add(UppushDeleteAppResponse200ApplicationJson.serializer)
       ..addBuilderFactory(
         const FullType(UppushUnifiedpushDiscoveryResponse200ApplicationJson),
         UppushUnifiedpushDiscoveryResponse200ApplicationJson.new,
       )
+      ..add(UppushUnifiedpushDiscoveryResponse200ApplicationJson.serializer)
+      ..addBuilderFactory(
+        const FullType(UppushUnifiedpushDiscoveryResponse200ApplicationJson_Unifiedpush),
+        UppushUnifiedpushDiscoveryResponse200ApplicationJson_Unifiedpush.new,
+      )
+      ..add(UppushUnifiedpushDiscoveryResponse200ApplicationJson_Unifiedpush.serializer)
       ..addBuilderFactory(
         const FullType(UppushPushResponse201ApplicationJson),
         UppushPushResponse201ApplicationJson.new,
       )
+      ..add(UppushPushResponse201ApplicationJson.serializer)
       ..addBuilderFactory(
         const FullType(UppushGatewayMatrixDiscoveryResponse200ApplicationJson),
         UppushGatewayMatrixDiscoveryResponse200ApplicationJson.new,
       )
+      ..add(UppushGatewayMatrixDiscoveryResponse200ApplicationJson.serializer)
+      ..addBuilderFactory(
+        const FullType(UppushGatewayMatrixDiscoveryResponse200ApplicationJson_Unifiedpush),
+        UppushGatewayMatrixDiscoveryResponse200ApplicationJson_Unifiedpush.new,
+      )
+      ..add(UppushGatewayMatrixDiscoveryResponse200ApplicationJson_Unifiedpush.serializer)
       ..addBuilderFactory(
         const FullType(UppushGatewayMatrixResponse200ApplicationJson),
         UppushGatewayMatrixResponse200ApplicationJson.new,
-      ))
+      )
+      ..add(UppushGatewayMatrixResponse200ApplicationJson.serializer)
+      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), ListBuilder<String>.new))
     .build();
 
 Serializers get uppushSerializers => _serializers;
diff --git a/packages/nextcloud/lib/src/api/uppush.openapi.g.dart b/packages/nextcloud/lib/src/api/uppush.openapi.g.dart
index 09b7404c..e45de0f2 100644
--- a/packages/nextcloud/lib/src/api/uppush.openapi.g.dart
+++ b/packages/nextcloud/lib/src/api/uppush.openapi.g.dart
@@ -6,22 +6,6 @@ part of 'uppush.openapi.dart';
 // BuiltValueGenerator
 // **************************************************************************
 
-Serializers _$_serializers = (Serializers().toBuilder()
-      ..add(UppushCheckResponse200ApplicationJson.serializer)
-      ..add(UppushCreateAppResponse200ApplicationJson.serializer)
-      ..add(UppushCreateDeviceResponse200ApplicationJson.serializer)
-      ..add(UppushDeleteAppResponse200ApplicationJson.serializer)
-      ..add(UppushDeleteDeviceResponse200ApplicationJson.serializer)
-      ..add(UppushGatewayMatrixDiscoveryResponse200ApplicationJson.serializer)
-      ..add(UppushGatewayMatrixDiscoveryResponse200ApplicationJson_Unifiedpush.serializer)
-      ..add(UppushGatewayMatrixResponse200ApplicationJson.serializer)
-      ..add(UppushPushResponse201ApplicationJson.serializer)
-      ..add(UppushSetKeepaliveResponse200ApplicationJson.serializer)
-      ..add(UppushSyncDeviceResponse401ApplicationJson.serializer)
-      ..add(UppushUnifiedpushDiscoveryResponse200ApplicationJson.serializer)
-      ..add(UppushUnifiedpushDiscoveryResponse200ApplicationJson_Unifiedpush.serializer)
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(String)]), () => ListBuilder<String>()))
-    .build();
 Serializer<UppushCheckResponse200ApplicationJson> _$uppushCheckResponse200ApplicationJsonSerializer =
     _$UppushCheckResponse200ApplicationJsonSerializer();
 Serializer<UppushSetKeepaliveResponse200ApplicationJson> _$uppushSetKeepaliveResponse200ApplicationJsonSerializer =
diff --git a/packages/nextcloud/lib/src/api/user_status.openapi.dart b/packages/nextcloud/lib/src/api/user_status.openapi.dart
index 6e00afa4..25e97465 100644
--- a/packages/nextcloud/lib/src/api/user_status.openapi.dart
+++ b/packages/nextcloud/lib/src/api/user_status.openapi.dart
@@ -991,31 +991,67 @@ abstract class UserStatusEmptyOCS implements Built<UserStatusEmptyOCS, UserStatu
   static Serializer<UserStatusEmptyOCS> get serializer => _$userStatusEmptyOCSSerializer;
 }
 
-@SerializersFor([
-  UserStatusGetPublicStatuses,
-  UserStatusGetPublicStatuses_Ocs,
-  UserStatusOCSMeta,
-  UserStatusPublicStatus,
-  UserStatusClearAt,
-  UserStatusGetPublicStatus,
-  UserStatusGetPublicStatus_Ocs,
-  UserStatusGetStatus,
-  UserStatusGetStatus_Ocs,
-  UserStatusStatus1,
-  UserStatusPredefinedStatuses,
-  UserStatusPredefinedStatuses_Ocs,
-  UserStatusPredefinedStatus,
-  UserStatusHeartbeat,
-  UserStatusHeartbeat_Ocs,
-  UserStatusEmptyOCS,
-  UserStatusEmptyOCS_Ocs,
-])
-final Serializers _serializers = (_$_serializers.toBuilder()
+final Serializers _serializers = (Serializers().toBuilder()
       ..addBuilderFactory(const FullType(UserStatusGetPublicStatuses), UserStatusGetPublicStatuses.new)
+      ..add(UserStatusGetPublicStatuses.serializer)
+      ..addBuilderFactory(const FullType(UserStatusGetPublicStatuses_Ocs), UserStatusGetPublicStatuses_Ocs.new)
+      ..add(UserStatusGetPublicStatuses_Ocs.serializer)
+      ..addBuilderFactory(const FullType(UserStatusOCSMeta), UserStatusOCSMeta.new)
+      ..add(UserStatusOCSMeta.serializer)
+      ..addBuilderFactory(const FullType(UserStatusPublicStatus), UserStatusPublicStatus.new)
+      ..add(UserStatusPublicStatus.serializer)
+      ..addBuilderFactory(const FullType(UserStatusPublicStatus_ClearAt), UserStatusPublicStatus_ClearAt.new)
+      ..add(UserStatusPublicStatus_ClearAt.serializer)
+      ..addBuilderFactory(const FullType(UserStatusClearAt), UserStatusClearAt.new)
+      ..add(UserStatusClearAt.serializer)
+      ..add(UserStatusClearAt_Type.serializer)
+      ..addBuilderFactory(const FullType(UserStatusClearAt_Time), UserStatusClearAt_Time.new)
+      ..add(UserStatusClearAt_Time.serializer)
+      ..add(UserStatusClearAt_Time0.serializer)
+      ..add(UserStatusType.serializer)
+      ..addBuilderFactory(
+        const FullType(BuiltList, [FullType(UserStatusPublicStatus)]),
+        ListBuilder<UserStatusPublicStatus>.new,
+      )
       ..addBuilderFactory(const FullType(UserStatusGetPublicStatus), UserStatusGetPublicStatus.new)
+      ..add(UserStatusGetPublicStatus.serializer)
+      ..addBuilderFactory(const FullType(UserStatusGetPublicStatus_Ocs), UserStatusGetPublicStatus_Ocs.new)
+      ..add(UserStatusGetPublicStatus_Ocs.serializer)
+      ..addBuilderFactory(const FullType(UserStatusGetPublicStatus_Ocs_Data), UserStatusGetPublicStatus_Ocs_Data.new)
+      ..add(UserStatusGetPublicStatus_Ocs_Data.serializer)
+      ..addBuilderFactory(const FullType(BuiltList, [FullType(JsonObject)]), ListBuilder<JsonObject>.new)
       ..addBuilderFactory(const FullType(UserStatusGetStatus), UserStatusGetStatus.new)
+      ..add(UserStatusGetStatus.serializer)
+      ..addBuilderFactory(const FullType(UserStatusGetStatus_Ocs), UserStatusGetStatus_Ocs.new)
+      ..add(UserStatusGetStatus_Ocs.serializer)
+      ..addBuilderFactory(const FullType(UserStatusGetStatus_Ocs_Data), UserStatusGetStatus_Ocs_Data.new)
+      ..add(UserStatusGetStatus_Ocs_Data.serializer)
+      ..addBuilderFactory(const FullType(UserStatusStatus), UserStatusStatus.new)
+      ..add(UserStatusStatus.serializer)
+      ..addBuilderFactory(const FullType(UserStatusStatus1), UserStatusStatus1.new)
+      ..add(UserStatusStatus1.serializer)
       ..addBuilderFactory(const FullType(UserStatusPredefinedStatuses), UserStatusPredefinedStatuses.new)
-      ..addBuilderFactory(const FullType(UserStatusHeartbeat), UserStatusHeartbeat.new))
+      ..add(UserStatusPredefinedStatuses.serializer)
+      ..addBuilderFactory(const FullType(UserStatusPredefinedStatuses_Ocs), UserStatusPredefinedStatuses_Ocs.new)
+      ..add(UserStatusPredefinedStatuses_Ocs.serializer)
+      ..addBuilderFactory(const FullType(UserStatusPredefinedStatus), UserStatusPredefinedStatus.new)
+      ..add(UserStatusPredefinedStatus.serializer)
+      ..addBuilderFactory(const FullType(UserStatusPredefinedStatus_ClearAt), UserStatusPredefinedStatus_ClearAt.new)
+      ..add(UserStatusPredefinedStatus_ClearAt.serializer)
+      ..addBuilderFactory(
+        const FullType(BuiltList, [FullType(UserStatusPredefinedStatus)]),
+        ListBuilder<UserStatusPredefinedStatus>.new,
+      )
+      ..addBuilderFactory(const FullType(UserStatusHeartbeat), UserStatusHeartbeat.new)
+      ..add(UserStatusHeartbeat.serializer)
+      ..addBuilderFactory(const FullType(UserStatusHeartbeat_Ocs), UserStatusHeartbeat_Ocs.new)
+      ..add(UserStatusHeartbeat_Ocs.serializer)
+      ..addBuilderFactory(const FullType(UserStatusHeartbeat_Ocs_Data), UserStatusHeartbeat_Ocs_Data.new)
+      ..add(UserStatusHeartbeat_Ocs_Data.serializer)
+      ..addBuilderFactory(const FullType(UserStatusEmptyOCS), UserStatusEmptyOCS.new)
+      ..add(UserStatusEmptyOCS.serializer)
+      ..addBuilderFactory(const FullType(UserStatusEmptyOCS_Ocs), UserStatusEmptyOCS_Ocs.new)
+      ..add(UserStatusEmptyOCS_Ocs.serializer))
     .build();
 
 Serializers get userStatusSerializers => _serializers;
diff --git a/packages/nextcloud/lib/src/api/user_status.openapi.g.dart b/packages/nextcloud/lib/src/api/user_status.openapi.g.dart
index 52bd5527..f11a4050 100644
--- a/packages/nextcloud/lib/src/api/user_status.openapi.g.dart
+++ b/packages/nextcloud/lib/src/api/user_status.openapi.g.dart
@@ -77,43 +77,6 @@ final BuiltSet<UserStatusType> _$userStatusTypeValues = BuiltSet<UserStatusType>
   _$userStatusTypeInvisible,
 ]);
 
-Serializers _$_serializers = (Serializers().toBuilder()
-      ..add(UserStatusClearAt.serializer)
-      ..add(UserStatusClearAt_Time.serializer)
-      ..add(UserStatusClearAt_Time0.serializer)
-      ..add(UserStatusClearAt_Type.serializer)
-      ..add(UserStatusEmptyOCS.serializer)
-      ..add(UserStatusEmptyOCS_Ocs.serializer)
-      ..add(UserStatusGetPublicStatus.serializer)
-      ..add(UserStatusGetPublicStatus_Ocs.serializer)
-      ..add(UserStatusGetPublicStatus_Ocs_Data.serializer)
-      ..add(UserStatusGetPublicStatuses.serializer)
-      ..add(UserStatusGetPublicStatuses_Ocs.serializer)
-      ..add(UserStatusGetStatus.serializer)
-      ..add(UserStatusGetStatus_Ocs.serializer)
-      ..add(UserStatusGetStatus_Ocs_Data.serializer)
-      ..add(UserStatusHeartbeat.serializer)
-      ..add(UserStatusHeartbeat_Ocs.serializer)
-      ..add(UserStatusHeartbeat_Ocs_Data.serializer)
-      ..add(UserStatusOCSMeta.serializer)
-      ..add(UserStatusPredefinedStatus.serializer)
-      ..add(UserStatusPredefinedStatus_ClearAt.serializer)
-      ..add(UserStatusPredefinedStatuses.serializer)
-      ..add(UserStatusPredefinedStatuses_Ocs.serializer)
-      ..add(UserStatusPublicStatus.serializer)
-      ..add(UserStatusPublicStatus_ClearAt.serializer)
-      ..add(UserStatusStatus.serializer)
-      ..add(UserStatusStatus1.serializer)
-      ..add(UserStatusType.serializer)
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(JsonObject)]), () => ListBuilder<JsonObject>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(JsonObject)]), () => ListBuilder<JsonObject>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(JsonObject)]), () => ListBuilder<JsonObject>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(JsonObject)]), () => ListBuilder<JsonObject>())
-      ..addBuilderFactory(const FullType(BuiltList, [FullType(UserStatusPredefinedStatus)]),
-          () => ListBuilder<UserStatusPredefinedStatus>())
-      ..addBuilderFactory(
-          const FullType(BuiltList, [FullType(UserStatusPublicStatus)]), () => ListBuilder<UserStatusPublicStatus>()))
-    .build();
 Serializer<UserStatusOCSMeta> _$userStatusOCSMetaSerializer = _$UserStatusOCSMetaSerializer();
 Serializer<UserStatusClearAt_Type> _$userStatusClearAtTypeSerializer = _$UserStatusClearAt_TypeSerializer();
 Serializer<UserStatusClearAt_Time0> _$userStatusClearAtTime0Serializer = _$UserStatusClearAt_Time0Serializer();