diff --git a/lib/Components/multi_string_input_html_modal.dart b/lib/Components/multi_string_input_html_modal.dart
index 53672d4..1297e8a 100644
--- a/lib/Components/multi_string_input_html_modal.dart
+++ b/lib/Components/multi_string_input_html_modal.dart
@@ -95,6 +95,23 @@ showMultiStringInputHTML (String label, String modalLabel, bool isTitle, List<Tr
 getTranslations(BuildContext context, AppContext appContext, QuillEditorController controllerQuill, String label, bool isTitle, bool isAudio, List<TranslationDTO> newValues) {
   List<Widget> translations = <Widget>[];
   ManagerAppContext managerAppContext = appContext.getContext();
+  final customToolBarList = isTitle ? [
+    ToolBarStyle.bold,
+    ToolBarStyle.italic,
+    ToolBarStyle.color,
+    ToolBarStyle.background,
+    ToolBarStyle.clean
+    ] : [
+    ToolBarStyle.bold,
+    ToolBarStyle.italic,
+    ToolBarStyle.align,
+    ToolBarStyle.color,
+    ToolBarStyle.background,
+    ToolBarStyle.listBullet,
+    ToolBarStyle.listOrdered,
+    ToolBarStyle.clean
+  ];
+
   var language = managerAppContext.selectedConfiguration!.languages![0];
   //for(var language in managerAppContext.selectedConfiguration!.languages!) {
     translations.add(
@@ -130,11 +147,9 @@ getTranslations(BuildContext context, AppContext appContext, QuillEditorControll
                             activeIconColor: Colors.green,
                             padding: const EdgeInsets.all(8),
                             iconSize: 20,
+                            toolBarConfig: customToolBarList,
                             controller: controllerQuill,
-                            customButtons: [
-                              InkWell(onTap: () {}, child: const Icon(Icons.favorite)),
-                              InkWell(onTap: () {}, child: const Icon(Icons.add_circle)),
-                            ],
+                            customButtons: [],
                           ),
                           QuillHtmlEditor(
                               text: newValues.where((element) => element.language == language).first.value!,
@@ -157,7 +172,7 @@ getTranslations(BuildContext context, AppContext appContext, QuillEditorControll
                               onEditorResized: (height) =>
                                   debugPrint('Editor resized $height'),
                               onSelectionChanged: (sel) =>
-                                  debugPrint('${sel.index},${sel.length}')
+                                  debugPrint('${sel.index},${sel.length}'),
                           ),
                         ],
                       )
diff --git a/lib/Screens/Configurations/Section/section_detail_screen.dart b/lib/Screens/Configurations/Section/section_detail_screen.dart
index ec0657b..746a852 100644
--- a/lib/Screens/Configurations/Section/section_detail_screen.dart
+++ b/lib/Screens/Configurations/Section/section_detail_screen.dart
@@ -90,7 +90,7 @@ class _SectionDetailScreenState extends State<SectionDetailScreen> {
         children: [
           Container(
             //color: Colors.orangeAccent,
-            height: 75,
+            height: 80,
             child: Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
@@ -180,7 +180,7 @@ class _SectionDetailScreenState extends State<SectionDetailScreen> {
                                         height: 125,
                                         child: RepaintBoundary(
                                           key: globalKey,
-                                          child: QrImage(
+                                          child: QrImageView(
                                             padding: EdgeInsets.only(left: 5.0, top: 5.0, bottom: 5.0, right: 5.0),
                                             data: sectionDTO!.id!,
                                             version: QrVersions.auto,
@@ -189,7 +189,7 @@ class _SectionDetailScreenState extends State<SectionDetailScreen> {
                                         ),
                                       ),
                                     ),
-                                    SelectableText(sectionDTO.id!, style: new TextStyle(fontSize: 15))
+                                    SelectableText(sectionDTO!.id!, style: new TextStyle(fontSize: 15))
                                   ],
                                 ),
                                 CheckInputContainer(
@@ -203,14 +203,14 @@ class _SectionDetailScreenState extends State<SectionDetailScreen> {
                                     });
                                   },
                                 ),
-                                if(sectionDTO.isBeacon!)
+                                if(sectionDTO!.isBeacon!)
                                   NumberInputContainer(
                                     label: "Identifiant Beacon :",
-                                    initialValue: sectionDTO.beaconId != null ? sectionDTO.beaconId! : 0,
+                                    initialValue: sectionDTO!.beaconId != null ? sectionDTO.beaconId! : 0,
                                     isSmall: true,
                                     onChanged: (value) {
                                       try {
-                                        sectionDTO.beaconId = int.parse(value);
+                                        sectionDTO!.beaconId = int.parse(value);
                                       } catch (e) {
                                         print('BeaconId not a number');
                                         showNotification(Colors.orange, kWhite, 'Cela doit être un chiffre', context, null);
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index c88361f..9b15cc8 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -14,7 +14,7 @@ import path_provider_foundation
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin"))
   JustAudioPlugin.register(with: registry.registrar(forPlugin: "JustAudioPlugin"))
-  FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
+  FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PasteboardPlugin.register(with: registry.registrar(forPlugin: "PasteboardPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
 }
diff --git a/manager_api_new/README.md b/manager_api_new/README.md
index 60866c3..978f7ba 100644
--- a/manager_api_new/README.md
+++ b/manager_api_new/README.md
@@ -156,7 +156,8 @@ Class | Method | HTTP request | Description
 ## Documentation For Authorization
 
 
-## bearer
+Authentication schemes defined for the API:
+### bearer
 
 - **Type**: OAuth
 - **Flow**: password
diff --git a/manager_api_new/lib/api_client.dart b/manager_api_new/lib/api_client.dart
index 70d5cce..007b008 100644
--- a/manager_api_new/lib/api_client.dart
+++ b/manager_api_new/lib/api_client.dart
@@ -11,11 +11,13 @@
 part of openapi.api;
 
 class ApiClient {
-  ApiClient({this.basePath = 'https://api.mymuseum.be', this.authentication});
+  ApiClient({this.basePath = 'https://api.mymuseum.be', this.authentication,});
 
   final String basePath;
+  final Authentication? authentication;
 
   var _client = Client();
+  final _defaultHeaderMap = <String, String>{};
 
   /// Returns the current HTTP [Client] instance to use in this class.
   ///
@@ -27,15 +29,12 @@ class ApiClient {
     _client = newClient;
   }
 
-  final _defaultHeaderMap = <String, String>{};
-  final Authentication? authentication;
+  Map<String, String> get defaultHeaderMap => _defaultHeaderMap;
 
   void addDefaultHeader(String key, String value) {
      _defaultHeaderMap[key] = value;
   }
 
-  Map<String,String> get defaultHeaderMap => _defaultHeaderMap;
-
   // We don't use a Map<String, String> for queryParams.
   // If collectionFormat is 'multi', a key might appear multiple times.
   Future<Response> invokeAPI(
@@ -47,7 +46,7 @@ class ApiClient {
     Map<String, String> formParams,
     String? contentType,
   ) async {
-    _updateParamsForAuth(queryParams, headerParams);
+    await authentication?.applyToParams(queryParams, headerParams);
 
     headerParams.addAll(_defaultHeaderMap);
     if (contentType != null) {
@@ -165,16 +164,6 @@ class ApiClient {
   @Deprecated('Scheduled for removal in OpenAPI Generator 6.x. Use serializeAsync() instead.')
   String serialize(Object? value) => value == null ? '' : json.encode(value);
 
-  /// Update query and header parameters based on authentication settings.
-  void _updateParamsForAuth(
-    List<QueryParam> queryParams,
-    Map<String, String> headerParams,
-  ) {
-    if (authentication != null) {
-      authentication!.applyToParams(queryParams, headerParams);
-    }
-  }
-
   static dynamic _deserialize(dynamic value, String targetType, {bool growable = false}) {
     try {
       switch (targetType) {
@@ -190,6 +179,8 @@ class ApiClient {
           }
           final valueString = '$value'.toLowerCase();
           return valueString == 'true' || valueString == '1';
+        case 'DateTime':
+          return value is DateTime ? value : DateTime.tryParse(value);
         case 'ArticleDTO':
           return ArticleDTO.fromJson(value);
         case 'ConfigurationDTO':
diff --git a/manager_api_new/lib/auth/api_key_auth.dart b/manager_api_new/lib/auth/api_key_auth.dart
index e304eda..84dc295 100644
--- a/manager_api_new/lib/auth/api_key_auth.dart
+++ b/manager_api_new/lib/auth/api_key_auth.dart
@@ -20,7 +20,7 @@ class ApiKeyAuth implements Authentication {
   String apiKey = '';
 
   @override
-  void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams) {
+  Future<void> applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams,) async {
     final paramValue = apiKeyPrefix.isEmpty ? apiKey : '$apiKeyPrefix $apiKey';
 
     if (paramValue.isNotEmpty) {
diff --git a/manager_api_new/lib/auth/authentication.dart b/manager_api_new/lib/auth/authentication.dart
index 49baf7c..1b1b8ae 100644
--- a/manager_api_new/lib/auth/authentication.dart
+++ b/manager_api_new/lib/auth/authentication.dart
@@ -13,5 +13,5 @@ part of openapi.api;
 // ignore: one_member_abstracts
 abstract class Authentication {
   /// Apply authentication settings to header and query params.
-  void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams);
+  Future<void> applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams);
 }
diff --git a/manager_api_new/lib/auth/http_basic_auth.dart b/manager_api_new/lib/auth/http_basic_auth.dart
index 81abd71..dfedaa5 100644
--- a/manager_api_new/lib/auth/http_basic_auth.dart
+++ b/manager_api_new/lib/auth/http_basic_auth.dart
@@ -17,7 +17,7 @@ class HttpBasicAuth implements Authentication {
   String password;
 
   @override
-  void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams) {
+  Future<void> applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams,) async {
     if (username.isNotEmpty && password.isNotEmpty) {
       final credentials = '$username:$password';
       headerParams['Authorization'] = 'Basic ${base64.encode(utf8.encode(credentials))}';
diff --git a/manager_api_new/lib/auth/http_bearer_auth.dart b/manager_api_new/lib/auth/http_bearer_auth.dart
index 213f348..eddf3a5 100644
--- a/manager_api_new/lib/auth/http_bearer_auth.dart
+++ b/manager_api_new/lib/auth/http_bearer_auth.dart
@@ -27,7 +27,7 @@ class HttpBearerAuth implements Authentication {
   }
 
   @override
-  void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams) {
+  Future<void> applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams,) async {
     if (_accessToken == null) {
       return;
     }
diff --git a/manager_api_new/lib/auth/oauth.dart b/manager_api_new/lib/auth/oauth.dart
index e9b87cf..e9e7d78 100644
--- a/manager_api_new/lib/auth/oauth.dart
+++ b/manager_api_new/lib/auth/oauth.dart
@@ -16,7 +16,7 @@ class OAuth implements Authentication {
   String accessToken;
 
   @override
-  void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams) {
+  Future<void> applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams,) async {
     if (accessToken.isNotEmpty) {
       headerParams['Authorization'] = 'Bearer $accessToken';
     }
diff --git a/manager_api_new/lib/model/article_dto.dart b/manager_api_new/lib/model/article_dto.dart
index 5e6cd8f..3b72137 100644
--- a/manager_api_new/lib/model/article_dto.dart
+++ b/manager_api_new/lib/model/article_dto.dart
@@ -63,23 +63,33 @@ class ArticleDTO {
   String toString() => 'ArticleDTO[content=$content, isContentTop=$isContentTop, audioIds=$audioIds, isReadAudioAuto=$isReadAudioAuto, images=$images]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (content != null) {
-      _json[r'content'] = content;
+    final json = <String, dynamic>{};
+    if (this.content != null) {
+      json[r'content'] = this.content;
+    } else {
+      json[r'content'] = null;
     }
-    if (isContentTop != null) {
-      _json[r'isContentTop'] = isContentTop;
+    if (this.isContentTop != null) {
+      json[r'isContentTop'] = this.isContentTop;
+    } else {
+      json[r'isContentTop'] = null;
     }
-    if (audioIds != null) {
-      _json[r'audioIds'] = audioIds;
+    if (this.audioIds != null) {
+      json[r'audioIds'] = this.audioIds;
+    } else {
+      json[r'audioIds'] = null;
     }
-    if (isReadAudioAuto != null) {
-      _json[r'isReadAudioAuto'] = isReadAudioAuto;
+    if (this.isReadAudioAuto != null) {
+      json[r'isReadAudioAuto'] = this.isReadAudioAuto;
+    } else {
+      json[r'isReadAudioAuto'] = null;
     }
-    if (images != null) {
-      _json[r'images'] = images;
+    if (this.images != null) {
+      json[r'images'] = this.images;
+    } else {
+      json[r'images'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [ArticleDTO] instance and imports its values from
@@ -101,17 +111,17 @@ class ArticleDTO {
       }());
 
       return ArticleDTO(
-        content: TranslationDTO.listFromJson(json[r'content']) ?? const [],
+        content: TranslationDTO.listFromJson(json[r'content']),
         isContentTop: mapValueOfType<bool>(json, r'isContentTop'),
-        audioIds: TranslationDTO.listFromJson(json[r'audioIds']) ?? const [],
+        audioIds: TranslationDTO.listFromJson(json[r'audioIds']),
         isReadAudioAuto: mapValueOfType<bool>(json, r'isReadAudioAuto'),
-        images: ImageDTO.listFromJson(json[r'images']) ?? const [],
+        images: ImageDTO.listFromJson(json[r'images']),
       );
     }
     return null;
   }
 
-  static List<ArticleDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<ArticleDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <ArticleDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -142,12 +152,10 @@ class ArticleDTO {
   static Map<String, List<ArticleDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<ArticleDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = ArticleDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = ArticleDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/configuration_dto.dart b/manager_api_new/lib/model/configuration_dto.dart
index fae5f68..e0d7e9c 100644
--- a/manager_api_new/lib/model/configuration_dto.dart
+++ b/manager_api_new/lib/model/configuration_dto.dart
@@ -120,50 +120,78 @@ class ConfigurationDTO {
   String toString() => 'ConfigurationDTO[id=$id, label=$label, title=$title, imageId=$imageId, imageSource=$imageSource, primaryColor=$primaryColor, secondaryColor=$secondaryColor, languages=$languages, dateCreation=$dateCreation, isMobile=$isMobile, isTablet=$isTablet, isOffline=$isOffline, instanceId=$instanceId, sectionIds=$sectionIds]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (id != null) {
-      _json[r'id'] = id;
+    final json = <String, dynamic>{};
+    if (this.id != null) {
+      json[r'id'] = this.id;
+    } else {
+      json[r'id'] = null;
     }
-    if (label != null) {
-      _json[r'label'] = label;
+    if (this.label != null) {
+      json[r'label'] = this.label;
+    } else {
+      json[r'label'] = null;
     }
-    if (title != null) {
-      _json[r'title'] = title;
+    if (this.title != null) {
+      json[r'title'] = this.title;
+    } else {
+      json[r'title'] = null;
     }
-    if (imageId != null) {
-      _json[r'imageId'] = imageId;
+    if (this.imageId != null) {
+      json[r'imageId'] = this.imageId;
+    } else {
+      json[r'imageId'] = null;
     }
-    if (imageSource != null) {
-      _json[r'imageSource'] = imageSource;
+    if (this.imageSource != null) {
+      json[r'imageSource'] = this.imageSource;
+    } else {
+      json[r'imageSource'] = null;
     }
-    if (primaryColor != null) {
-      _json[r'primaryColor'] = primaryColor;
+    if (this.primaryColor != null) {
+      json[r'primaryColor'] = this.primaryColor;
+    } else {
+      json[r'primaryColor'] = null;
     }
-    if (secondaryColor != null) {
-      _json[r'secondaryColor'] = secondaryColor;
+    if (this.secondaryColor != null) {
+      json[r'secondaryColor'] = this.secondaryColor;
+    } else {
+      json[r'secondaryColor'] = null;
     }
-    if (languages != null) {
-      _json[r'languages'] = languages;
+    if (this.languages != null) {
+      json[r'languages'] = this.languages;
+    } else {
+      json[r'languages'] = null;
     }
-    if (dateCreation != null) {
-      _json[r'dateCreation'] = dateCreation!.toUtc().toIso8601String();
+    if (this.dateCreation != null) {
+      json[r'dateCreation'] = this.dateCreation!.toUtc().toIso8601String();
+    } else {
+      json[r'dateCreation'] = null;
     }
-    if (isMobile != null) {
-      _json[r'isMobile'] = isMobile;
+    if (this.isMobile != null) {
+      json[r'isMobile'] = this.isMobile;
+    } else {
+      json[r'isMobile'] = null;
     }
-    if (isTablet != null) {
-      _json[r'isTablet'] = isTablet;
+    if (this.isTablet != null) {
+      json[r'isTablet'] = this.isTablet;
+    } else {
+      json[r'isTablet'] = null;
     }
-    if (isOffline != null) {
-      _json[r'isOffline'] = isOffline;
+    if (this.isOffline != null) {
+      json[r'isOffline'] = this.isOffline;
+    } else {
+      json[r'isOffline'] = null;
     }
-    if (instanceId != null) {
-      _json[r'instanceId'] = instanceId;
+    if (this.instanceId != null) {
+      json[r'instanceId'] = this.instanceId;
+    } else {
+      json[r'instanceId'] = null;
     }
-    if (sectionIds != null) {
-      _json[r'sectionIds'] = sectionIds;
+    if (this.sectionIds != null) {
+      json[r'sectionIds'] = this.sectionIds;
+    } else {
+      json[r'sectionIds'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [ConfigurationDTO] instance and imports its values from
@@ -187,7 +215,7 @@ class ConfigurationDTO {
       return ConfigurationDTO(
         id: mapValueOfType<String>(json, r'id'),
         label: mapValueOfType<String>(json, r'label'),
-        title: TranslationDTO.listFromJson(json[r'title']) ?? const [],
+        title: TranslationDTO.listFromJson(json[r'title']),
         imageId: mapValueOfType<String>(json, r'imageId'),
         imageSource: mapValueOfType<String>(json, r'imageSource'),
         primaryColor: mapValueOfType<String>(json, r'primaryColor'),
@@ -208,7 +236,7 @@ class ConfigurationDTO {
     return null;
   }
 
-  static List<ConfigurationDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<ConfigurationDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <ConfigurationDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -239,12 +267,10 @@ class ConfigurationDTO {
   static Map<String, List<ConfigurationDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<ConfigurationDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = ConfigurationDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = ConfigurationDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/device_detail_dto.dart b/manager_api_new/lib/model/device_detail_dto.dart
index 88ec18f..8c645d6 100644
--- a/manager_api_new/lib/model/device_detail_dto.dart
+++ b/manager_api_new/lib/model/device_detail_dto.dart
@@ -131,53 +131,83 @@ class DeviceDetailDTO {
   String toString() => 'DeviceDetailDTO[id=$id, identifier=$identifier, name=$name, ipAddressWLAN=$ipAddressWLAN, ipAddressETH=$ipAddressETH, configurationId=$configurationId, configuration=$configuration, connected=$connected, dateCreation=$dateCreation, dateUpdate=$dateUpdate, instanceId=$instanceId, connectionLevel=$connectionLevel, lastConnectionLevel=$lastConnectionLevel, batteryLevel=$batteryLevel, lastBatteryLevel=$lastBatteryLevel]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (id != null) {
-      _json[r'id'] = id;
+    final json = <String, dynamic>{};
+    if (this.id != null) {
+      json[r'id'] = this.id;
+    } else {
+      json[r'id'] = null;
     }
-    if (identifier != null) {
-      _json[r'identifier'] = identifier;
+    if (this.identifier != null) {
+      json[r'identifier'] = this.identifier;
+    } else {
+      json[r'identifier'] = null;
     }
-    if (name != null) {
-      _json[r'name'] = name;
+    if (this.name != null) {
+      json[r'name'] = this.name;
+    } else {
+      json[r'name'] = null;
     }
-    if (ipAddressWLAN != null) {
-      _json[r'ipAddressWLAN'] = ipAddressWLAN;
+    if (this.ipAddressWLAN != null) {
+      json[r'ipAddressWLAN'] = this.ipAddressWLAN;
+    } else {
+      json[r'ipAddressWLAN'] = null;
     }
-    if (ipAddressETH != null) {
-      _json[r'ipAddressETH'] = ipAddressETH;
+    if (this.ipAddressETH != null) {
+      json[r'ipAddressETH'] = this.ipAddressETH;
+    } else {
+      json[r'ipAddressETH'] = null;
     }
-    if (configurationId != null) {
-      _json[r'configurationId'] = configurationId;
+    if (this.configurationId != null) {
+      json[r'configurationId'] = this.configurationId;
+    } else {
+      json[r'configurationId'] = null;
     }
-    if (configuration != null) {
-      _json[r'configuration'] = configuration;
+    if (this.configuration != null) {
+      json[r'configuration'] = this.configuration;
+    } else {
+      json[r'configuration'] = null;
     }
-    if (connected != null) {
-      _json[r'connected'] = connected;
+    if (this.connected != null) {
+      json[r'connected'] = this.connected;
+    } else {
+      json[r'connected'] = null;
     }
-    if (dateCreation != null) {
-      _json[r'dateCreation'] = dateCreation!.toUtc().toIso8601String();
+    if (this.dateCreation != null) {
+      json[r'dateCreation'] = this.dateCreation!.toUtc().toIso8601String();
+    } else {
+      json[r'dateCreation'] = null;
     }
-    if (dateUpdate != null) {
-      _json[r'dateUpdate'] = dateUpdate!.toUtc().toIso8601String();
+    if (this.dateUpdate != null) {
+      json[r'dateUpdate'] = this.dateUpdate!.toUtc().toIso8601String();
+    } else {
+      json[r'dateUpdate'] = null;
     }
-    if (instanceId != null) {
-      _json[r'instanceId'] = instanceId;
+    if (this.instanceId != null) {
+      json[r'instanceId'] = this.instanceId;
+    } else {
+      json[r'instanceId'] = null;
     }
-    if (connectionLevel != null) {
-      _json[r'connectionLevel'] = connectionLevel;
+    if (this.connectionLevel != null) {
+      json[r'connectionLevel'] = this.connectionLevel;
+    } else {
+      json[r'connectionLevel'] = null;
     }
-    if (lastConnectionLevel != null) {
-      _json[r'lastConnectionLevel'] = lastConnectionLevel!.toUtc().toIso8601String();
+    if (this.lastConnectionLevel != null) {
+      json[r'lastConnectionLevel'] = this.lastConnectionLevel!.toUtc().toIso8601String();
+    } else {
+      json[r'lastConnectionLevel'] = null;
     }
-    if (batteryLevel != null) {
-      _json[r'batteryLevel'] = batteryLevel;
+    if (this.batteryLevel != null) {
+      json[r'batteryLevel'] = this.batteryLevel;
+    } else {
+      json[r'batteryLevel'] = null;
     }
-    if (lastBatteryLevel != null) {
-      _json[r'lastBatteryLevel'] = lastBatteryLevel!.toUtc().toIso8601String();
+    if (this.lastBatteryLevel != null) {
+      json[r'lastBatteryLevel'] = this.lastBatteryLevel!.toUtc().toIso8601String();
+    } else {
+      json[r'lastBatteryLevel'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [DeviceDetailDTO] instance and imports its values from
@@ -219,7 +249,7 @@ class DeviceDetailDTO {
     return null;
   }
 
-  static List<DeviceDetailDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<DeviceDetailDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <DeviceDetailDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -250,12 +280,10 @@ class DeviceDetailDTO {
   static Map<String, List<DeviceDetailDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<DeviceDetailDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = DeviceDetailDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = DeviceDetailDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/device_detail_dto_all_of.dart b/manager_api_new/lib/model/device_detail_dto_all_of.dart
index cc7cfb6..2e990db 100644
--- a/manager_api_new/lib/model/device_detail_dto_all_of.dart
+++ b/manager_api_new/lib/model/device_detail_dto_all_of.dart
@@ -58,20 +58,28 @@ class DeviceDetailDTOAllOf {
   String toString() => 'DeviceDetailDTOAllOf[connectionLevel=$connectionLevel, lastConnectionLevel=$lastConnectionLevel, batteryLevel=$batteryLevel, lastBatteryLevel=$lastBatteryLevel]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (connectionLevel != null) {
-      _json[r'connectionLevel'] = connectionLevel;
+    final json = <String, dynamic>{};
+    if (this.connectionLevel != null) {
+      json[r'connectionLevel'] = this.connectionLevel;
+    } else {
+      json[r'connectionLevel'] = null;
     }
-    if (lastConnectionLevel != null) {
-      _json[r'lastConnectionLevel'] = lastConnectionLevel!.toUtc().toIso8601String();
+    if (this.lastConnectionLevel != null) {
+      json[r'lastConnectionLevel'] = this.lastConnectionLevel!.toUtc().toIso8601String();
+    } else {
+      json[r'lastConnectionLevel'] = null;
     }
-    if (batteryLevel != null) {
-      _json[r'batteryLevel'] = batteryLevel;
+    if (this.batteryLevel != null) {
+      json[r'batteryLevel'] = this.batteryLevel;
+    } else {
+      json[r'batteryLevel'] = null;
     }
-    if (lastBatteryLevel != null) {
-      _json[r'lastBatteryLevel'] = lastBatteryLevel!.toUtc().toIso8601String();
+    if (this.lastBatteryLevel != null) {
+      json[r'lastBatteryLevel'] = this.lastBatteryLevel!.toUtc().toIso8601String();
+    } else {
+      json[r'lastBatteryLevel'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [DeviceDetailDTOAllOf] instance and imports its values from
@@ -102,7 +110,7 @@ class DeviceDetailDTOAllOf {
     return null;
   }
 
-  static List<DeviceDetailDTOAllOf>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<DeviceDetailDTOAllOf> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <DeviceDetailDTOAllOf>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -133,12 +141,10 @@ class DeviceDetailDTOAllOf {
   static Map<String, List<DeviceDetailDTOAllOf>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<DeviceDetailDTOAllOf>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = DeviceDetailDTOAllOf.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = DeviceDetailDTOAllOf.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/device_dto.dart b/manager_api_new/lib/model/device_dto.dart
index 7915fb8..7d8ea3a 100644
--- a/manager_api_new/lib/model/device_dto.dart
+++ b/manager_api_new/lib/model/device_dto.dart
@@ -99,41 +99,63 @@ class DeviceDTO {
   String toString() => 'DeviceDTO[id=$id, identifier=$identifier, name=$name, ipAddressWLAN=$ipAddressWLAN, ipAddressETH=$ipAddressETH, configurationId=$configurationId, configuration=$configuration, connected=$connected, dateCreation=$dateCreation, dateUpdate=$dateUpdate, instanceId=$instanceId]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (id != null) {
-      _json[r'id'] = id;
+    final json = <String, dynamic>{};
+    if (this.id != null) {
+      json[r'id'] = this.id;
+    } else {
+      json[r'id'] = null;
     }
-    if (identifier != null) {
-      _json[r'identifier'] = identifier;
+    if (this.identifier != null) {
+      json[r'identifier'] = this.identifier;
+    } else {
+      json[r'identifier'] = null;
     }
-    if (name != null) {
-      _json[r'name'] = name;
+    if (this.name != null) {
+      json[r'name'] = this.name;
+    } else {
+      json[r'name'] = null;
     }
-    if (ipAddressWLAN != null) {
-      _json[r'ipAddressWLAN'] = ipAddressWLAN;
+    if (this.ipAddressWLAN != null) {
+      json[r'ipAddressWLAN'] = this.ipAddressWLAN;
+    } else {
+      json[r'ipAddressWLAN'] = null;
     }
-    if (ipAddressETH != null) {
-      _json[r'ipAddressETH'] = ipAddressETH;
+    if (this.ipAddressETH != null) {
+      json[r'ipAddressETH'] = this.ipAddressETH;
+    } else {
+      json[r'ipAddressETH'] = null;
     }
-    if (configurationId != null) {
-      _json[r'configurationId'] = configurationId;
+    if (this.configurationId != null) {
+      json[r'configurationId'] = this.configurationId;
+    } else {
+      json[r'configurationId'] = null;
     }
-    if (configuration != null) {
-      _json[r'configuration'] = configuration;
+    if (this.configuration != null) {
+      json[r'configuration'] = this.configuration;
+    } else {
+      json[r'configuration'] = null;
     }
-    if (connected != null) {
-      _json[r'connected'] = connected;
+    if (this.connected != null) {
+      json[r'connected'] = this.connected;
+    } else {
+      json[r'connected'] = null;
     }
-    if (dateCreation != null) {
-      _json[r'dateCreation'] = dateCreation!.toUtc().toIso8601String();
+    if (this.dateCreation != null) {
+      json[r'dateCreation'] = this.dateCreation!.toUtc().toIso8601String();
+    } else {
+      json[r'dateCreation'] = null;
     }
-    if (dateUpdate != null) {
-      _json[r'dateUpdate'] = dateUpdate!.toUtc().toIso8601String();
+    if (this.dateUpdate != null) {
+      json[r'dateUpdate'] = this.dateUpdate!.toUtc().toIso8601String();
+    } else {
+      json[r'dateUpdate'] = null;
     }
-    if (instanceId != null) {
-      _json[r'instanceId'] = instanceId;
+    if (this.instanceId != null) {
+      json[r'instanceId'] = this.instanceId;
+    } else {
+      json[r'instanceId'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [DeviceDTO] instance and imports its values from
@@ -171,7 +193,7 @@ class DeviceDTO {
     return null;
   }
 
-  static List<DeviceDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<DeviceDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <DeviceDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -202,12 +224,10 @@ class DeviceDTO {
   static Map<String, List<DeviceDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<DeviceDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = DeviceDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = DeviceDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/export_configuration_dto.dart b/manager_api_new/lib/model/export_configuration_dto.dart
index 04543ca..1b24580 100644
--- a/manager_api_new/lib/model/export_configuration_dto.dart
+++ b/manager_api_new/lib/model/export_configuration_dto.dart
@@ -130,56 +130,88 @@ class ExportConfigurationDTO {
   String toString() => 'ExportConfigurationDTO[id=$id, label=$label, title=$title, imageId=$imageId, imageSource=$imageSource, primaryColor=$primaryColor, secondaryColor=$secondaryColor, languages=$languages, dateCreation=$dateCreation, isMobile=$isMobile, isTablet=$isTablet, isOffline=$isOffline, instanceId=$instanceId, sectionIds=$sectionIds, sections=$sections, resources=$resources]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (id != null) {
-      _json[r'id'] = id;
+    final json = <String, dynamic>{};
+    if (this.id != null) {
+      json[r'id'] = this.id;
+    } else {
+      json[r'id'] = null;
     }
-    if (label != null) {
-      _json[r'label'] = label;
+    if (this.label != null) {
+      json[r'label'] = this.label;
+    } else {
+      json[r'label'] = null;
     }
-    if (title != null) {
-      _json[r'title'] = title;
+    if (this.title != null) {
+      json[r'title'] = this.title;
+    } else {
+      json[r'title'] = null;
     }
-    if (imageId != null) {
-      _json[r'imageId'] = imageId;
+    if (this.imageId != null) {
+      json[r'imageId'] = this.imageId;
+    } else {
+      json[r'imageId'] = null;
     }
-    if (imageSource != null) {
-      _json[r'imageSource'] = imageSource;
+    if (this.imageSource != null) {
+      json[r'imageSource'] = this.imageSource;
+    } else {
+      json[r'imageSource'] = null;
     }
-    if (primaryColor != null) {
-      _json[r'primaryColor'] = primaryColor;
+    if (this.primaryColor != null) {
+      json[r'primaryColor'] = this.primaryColor;
+    } else {
+      json[r'primaryColor'] = null;
     }
-    if (secondaryColor != null) {
-      _json[r'secondaryColor'] = secondaryColor;
+    if (this.secondaryColor != null) {
+      json[r'secondaryColor'] = this.secondaryColor;
+    } else {
+      json[r'secondaryColor'] = null;
     }
-    if (languages != null) {
-      _json[r'languages'] = languages;
+    if (this.languages != null) {
+      json[r'languages'] = this.languages;
+    } else {
+      json[r'languages'] = null;
     }
-    if (dateCreation != null) {
-      _json[r'dateCreation'] = dateCreation!.toUtc().toIso8601String();
+    if (this.dateCreation != null) {
+      json[r'dateCreation'] = this.dateCreation!.toUtc().toIso8601String();
+    } else {
+      json[r'dateCreation'] = null;
     }
-    if (isMobile != null) {
-      _json[r'isMobile'] = isMobile;
+    if (this.isMobile != null) {
+      json[r'isMobile'] = this.isMobile;
+    } else {
+      json[r'isMobile'] = null;
     }
-    if (isTablet != null) {
-      _json[r'isTablet'] = isTablet;
+    if (this.isTablet != null) {
+      json[r'isTablet'] = this.isTablet;
+    } else {
+      json[r'isTablet'] = null;
     }
-    if (isOffline != null) {
-      _json[r'isOffline'] = isOffline;
+    if (this.isOffline != null) {
+      json[r'isOffline'] = this.isOffline;
+    } else {
+      json[r'isOffline'] = null;
     }
-    if (instanceId != null) {
-      _json[r'instanceId'] = instanceId;
+    if (this.instanceId != null) {
+      json[r'instanceId'] = this.instanceId;
+    } else {
+      json[r'instanceId'] = null;
     }
-    if (sectionIds != null) {
-      _json[r'sectionIds'] = sectionIds;
+    if (this.sectionIds != null) {
+      json[r'sectionIds'] = this.sectionIds;
+    } else {
+      json[r'sectionIds'] = null;
     }
-    if (sections != null) {
-      _json[r'sections'] = sections;
+    if (this.sections != null) {
+      json[r'sections'] = this.sections;
+    } else {
+      json[r'sections'] = null;
     }
-    if (resources != null) {
-      _json[r'resources'] = resources;
+    if (this.resources != null) {
+      json[r'resources'] = this.resources;
+    } else {
+      json[r'resources'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [ExportConfigurationDTO] instance and imports its values from
@@ -203,7 +235,7 @@ class ExportConfigurationDTO {
       return ExportConfigurationDTO(
         id: mapValueOfType<String>(json, r'id'),
         label: mapValueOfType<String>(json, r'label'),
-        title: TranslationDTO.listFromJson(json[r'title']) ?? const [],
+        title: TranslationDTO.listFromJson(json[r'title']),
         imageId: mapValueOfType<String>(json, r'imageId'),
         imageSource: mapValueOfType<String>(json, r'imageSource'),
         primaryColor: mapValueOfType<String>(json, r'primaryColor'),
@@ -219,14 +251,14 @@ class ExportConfigurationDTO {
         sectionIds: json[r'sectionIds'] is List
             ? (json[r'sectionIds'] as List).cast<String>()
             : const [],
-        sections: SectionDTO.listFromJson(json[r'sections']) ?? const [],
-        resources: ResourceDTO.listFromJson(json[r'resources']) ?? const [],
+        sections: SectionDTO.listFromJson(json[r'sections']),
+        resources: ResourceDTO.listFromJson(json[r'resources']),
       );
     }
     return null;
   }
 
-  static List<ExportConfigurationDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<ExportConfigurationDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <ExportConfigurationDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -257,12 +289,10 @@ class ExportConfigurationDTO {
   static Map<String, List<ExportConfigurationDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<ExportConfigurationDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = ExportConfigurationDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = ExportConfigurationDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/export_configuration_dto_all_of.dart b/manager_api_new/lib/model/export_configuration_dto_all_of.dart
index 28c86a7..89650d1 100644
--- a/manager_api_new/lib/model/export_configuration_dto_all_of.dart
+++ b/manager_api_new/lib/model/export_configuration_dto_all_of.dart
@@ -36,14 +36,18 @@ class ExportConfigurationDTOAllOf {
   String toString() => 'ExportConfigurationDTOAllOf[sections=$sections, resources=$resources]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (sections != null) {
-      _json[r'sections'] = sections;
+    final json = <String, dynamic>{};
+    if (this.sections != null) {
+      json[r'sections'] = this.sections;
+    } else {
+      json[r'sections'] = null;
     }
-    if (resources != null) {
-      _json[r'resources'] = resources;
+    if (this.resources != null) {
+      json[r'resources'] = this.resources;
+    } else {
+      json[r'resources'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [ExportConfigurationDTOAllOf] instance and imports its values from
@@ -65,14 +69,14 @@ class ExportConfigurationDTOAllOf {
       }());
 
       return ExportConfigurationDTOAllOf(
-        sections: SectionDTO.listFromJson(json[r'sections']) ?? const [],
-        resources: ResourceDTO.listFromJson(json[r'resources']) ?? const [],
+        sections: SectionDTO.listFromJson(json[r'sections']),
+        resources: ResourceDTO.listFromJson(json[r'resources']),
       );
     }
     return null;
   }
 
-  static List<ExportConfigurationDTOAllOf>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<ExportConfigurationDTOAllOf> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <ExportConfigurationDTOAllOf>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -103,12 +107,10 @@ class ExportConfigurationDTOAllOf {
   static Map<String, List<ExportConfigurationDTOAllOf>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<ExportConfigurationDTOAllOf>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = ExportConfigurationDTOAllOf.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = ExportConfigurationDTOAllOf.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/geo_point_dto.dart b/manager_api_new/lib/model/geo_point_dto.dart
index 28600c5..e03a69c 100644
--- a/manager_api_new/lib/model/geo_point_dto.dart
+++ b/manager_api_new/lib/model/geo_point_dto.dart
@@ -62,26 +62,38 @@ class GeoPointDTO {
   String toString() => 'GeoPointDTO[id=$id, title=$title, description=$description, images=$images, latitude=$latitude, longitude=$longitude]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (id != null) {
-      _json[r'id'] = id;
+    final json = <String, dynamic>{};
+    if (this.id != null) {
+      json[r'id'] = this.id;
+    } else {
+      json[r'id'] = null;
     }
-    if (title != null) {
-      _json[r'title'] = title;
+    if (this.title != null) {
+      json[r'title'] = this.title;
+    } else {
+      json[r'title'] = null;
     }
-    if (description != null) {
-      _json[r'description'] = description;
+    if (this.description != null) {
+      json[r'description'] = this.description;
+    } else {
+      json[r'description'] = null;
     }
-    if (images != null) {
-      _json[r'images'] = images;
+    if (this.images != null) {
+      json[r'images'] = this.images;
+    } else {
+      json[r'images'] = null;
     }
-    if (latitude != null) {
-      _json[r'latitude'] = latitude;
+    if (this.latitude != null) {
+      json[r'latitude'] = this.latitude;
+    } else {
+      json[r'latitude'] = null;
     }
-    if (longitude != null) {
-      _json[r'longitude'] = longitude;
+    if (this.longitude != null) {
+      json[r'longitude'] = this.longitude;
+    } else {
+      json[r'longitude'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [GeoPointDTO] instance and imports its values from
@@ -104,9 +116,9 @@ class GeoPointDTO {
 
       return GeoPointDTO(
         id: mapValueOfType<int>(json, r'id'),
-        title: TranslationDTO.listFromJson(json[r'title']) ?? const [],
-        description: TranslationDTO.listFromJson(json[r'description']) ?? const [],
-        images: ImageGeoPoint.listFromJson(json[r'images']) ?? const [],
+        title: TranslationDTO.listFromJson(json[r'title']),
+        description: TranslationDTO.listFromJson(json[r'description']),
+        images: ImageGeoPoint.listFromJson(json[r'images']),
         latitude: mapValueOfType<String>(json, r'latitude'),
         longitude: mapValueOfType<String>(json, r'longitude'),
       );
@@ -114,7 +126,7 @@ class GeoPointDTO {
     return null;
   }
 
-  static List<GeoPointDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<GeoPointDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <GeoPointDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -145,12 +157,10 @@ class GeoPointDTO {
   static Map<String, List<GeoPointDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<GeoPointDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = GeoPointDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = GeoPointDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/image_dto.dart b/manager_api_new/lib/model/image_dto.dart
index b72c787..0a55eed 100644
--- a/manager_api_new/lib/model/image_dto.dart
+++ b/manager_api_new/lib/model/image_dto.dart
@@ -57,23 +57,33 @@ class ImageDTO {
   String toString() => 'ImageDTO[title=$title, description=$description, resourceId=$resourceId, source_=$source_, order=$order]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (title != null) {
-      _json[r'title'] = title;
+    final json = <String, dynamic>{};
+    if (this.title != null) {
+      json[r'title'] = this.title;
+    } else {
+      json[r'title'] = null;
     }
-    if (description != null) {
-      _json[r'description'] = description;
+    if (this.description != null) {
+      json[r'description'] = this.description;
+    } else {
+      json[r'description'] = null;
     }
-    if (resourceId != null) {
-      _json[r'resourceId'] = resourceId;
+    if (this.resourceId != null) {
+      json[r'resourceId'] = this.resourceId;
+    } else {
+      json[r'resourceId'] = null;
     }
-    if (source_ != null) {
-      _json[r'source'] = source_;
+    if (this.source_ != null) {
+      json[r'source'] = this.source_;
+    } else {
+      json[r'source'] = null;
     }
-    if (order != null) {
-      _json[r'order'] = order;
+    if (this.order != null) {
+      json[r'order'] = this.order;
+    } else {
+      json[r'order'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [ImageDTO] instance and imports its values from
@@ -95,8 +105,8 @@ class ImageDTO {
       }());
 
       return ImageDTO(
-        title: TranslationDTO.listFromJson(json[r'title']) ?? const [],
-        description: TranslationDTO.listFromJson(json[r'description']) ?? const [],
+        title: TranslationDTO.listFromJson(json[r'title']),
+        description: TranslationDTO.listFromJson(json[r'description']),
         resourceId: mapValueOfType<String>(json, r'resourceId'),
         source_: mapValueOfType<String>(json, r'source'),
         order: mapValueOfType<int>(json, r'order'),
@@ -105,7 +115,7 @@ class ImageDTO {
     return null;
   }
 
-  static List<ImageDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<ImageDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <ImageDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -136,12 +146,10 @@ class ImageDTO {
   static Map<String, List<ImageDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<ImageDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = ImageDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = ImageDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/image_geo_point.dart b/manager_api_new/lib/model/image_geo_point.dart
index 8291c85..4ecb68c 100644
--- a/manager_api_new/lib/model/image_geo_point.dart
+++ b/manager_api_new/lib/model/image_geo_point.dart
@@ -36,14 +36,18 @@ class ImageGeoPoint {
   String toString() => 'ImageGeoPoint[imageResourceId=$imageResourceId, imageSource=$imageSource]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (imageResourceId != null) {
-      _json[r'imageResourceId'] = imageResourceId;
+    final json = <String, dynamic>{};
+    if (this.imageResourceId != null) {
+      json[r'imageResourceId'] = this.imageResourceId;
+    } else {
+      json[r'imageResourceId'] = null;
     }
-    if (imageSource != null) {
-      _json[r'imageSource'] = imageSource;
+    if (this.imageSource != null) {
+      json[r'imageSource'] = this.imageSource;
+    } else {
+      json[r'imageSource'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [ImageGeoPoint] instance and imports its values from
@@ -72,7 +76,7 @@ class ImageGeoPoint {
     return null;
   }
 
-  static List<ImageGeoPoint>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<ImageGeoPoint> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <ImageGeoPoint>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -103,12 +107,10 @@ class ImageGeoPoint {
   static Map<String, List<ImageGeoPoint>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<ImageGeoPoint>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = ImageGeoPoint.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = ImageGeoPoint.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/instance.dart b/manager_api_new/lib/model/instance.dart
index 74e7ca8..01261b9 100644
--- a/manager_api_new/lib/model/instance.dart
+++ b/manager_api_new/lib/model/instance.dart
@@ -47,17 +47,23 @@ class Instance {
   String toString() => 'Instance[id=$id, name=$name, dateCreation=$dateCreation]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (id != null) {
-      _json[r'id'] = id;
+    final json = <String, dynamic>{};
+    if (this.id != null) {
+      json[r'id'] = this.id;
+    } else {
+      json[r'id'] = null;
     }
-    if (name != null) {
-      _json[r'name'] = name;
+    if (this.name != null) {
+      json[r'name'] = this.name;
+    } else {
+      json[r'name'] = null;
     }
-    if (dateCreation != null) {
-      _json[r'dateCreation'] = dateCreation!.toUtc().toIso8601String();
+    if (this.dateCreation != null) {
+      json[r'dateCreation'] = this.dateCreation!.toUtc().toIso8601String();
+    } else {
+      json[r'dateCreation'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [Instance] instance and imports its values from
@@ -87,7 +93,7 @@ class Instance {
     return null;
   }
 
-  static List<Instance>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<Instance> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <Instance>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -118,12 +124,10 @@ class Instance {
   static Map<String, List<Instance>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<Instance>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = Instance.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = Instance.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/instance_dto.dart b/manager_api_new/lib/model/instance_dto.dart
index a1d77a7..fda91b1 100644
--- a/manager_api_new/lib/model/instance_dto.dart
+++ b/manager_api_new/lib/model/instance_dto.dart
@@ -47,17 +47,23 @@ class InstanceDTO {
   String toString() => 'InstanceDTO[id=$id, name=$name, dateCreation=$dateCreation]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (id != null) {
-      _json[r'id'] = id;
+    final json = <String, dynamic>{};
+    if (this.id != null) {
+      json[r'id'] = this.id;
+    } else {
+      json[r'id'] = null;
     }
-    if (name != null) {
-      _json[r'name'] = name;
+    if (this.name != null) {
+      json[r'name'] = this.name;
+    } else {
+      json[r'name'] = null;
     }
-    if (dateCreation != null) {
-      _json[r'dateCreation'] = dateCreation!.toUtc().toIso8601String();
+    if (this.dateCreation != null) {
+      json[r'dateCreation'] = this.dateCreation!.toUtc().toIso8601String();
+    } else {
+      json[r'dateCreation'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [InstanceDTO] instance and imports its values from
@@ -87,7 +93,7 @@ class InstanceDTO {
     return null;
   }
 
-  static List<InstanceDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<InstanceDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <InstanceDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -118,12 +124,10 @@ class InstanceDTO {
   static Map<String, List<InstanceDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<InstanceDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = InstanceDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = InstanceDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/level_dto.dart b/manager_api_new/lib/model/level_dto.dart
index 58cfe04..3332644 100644
--- a/manager_api_new/lib/model/level_dto.dart
+++ b/manager_api_new/lib/model/level_dto.dart
@@ -41,17 +41,23 @@ class LevelDTO {
   String toString() => 'LevelDTO[label=$label, resourceId=$resourceId, source_=$source_]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (label != null) {
-      _json[r'label'] = label;
+    final json = <String, dynamic>{};
+    if (this.label != null) {
+      json[r'label'] = this.label;
+    } else {
+      json[r'label'] = null;
     }
-    if (resourceId != null) {
-      _json[r'resourceId'] = resourceId;
+    if (this.resourceId != null) {
+      json[r'resourceId'] = this.resourceId;
+    } else {
+      json[r'resourceId'] = null;
     }
-    if (source_ != null) {
-      _json[r'source'] = source_;
+    if (this.source_ != null) {
+      json[r'source'] = this.source_;
+    } else {
+      json[r'source'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [LevelDTO] instance and imports its values from
@@ -73,7 +79,7 @@ class LevelDTO {
       }());
 
       return LevelDTO(
-        label: TranslationDTO.listFromJson(json[r'label']) ?? const [],
+        label: TranslationDTO.listFromJson(json[r'label']),
         resourceId: mapValueOfType<String>(json, r'resourceId'),
         source_: mapValueOfType<String>(json, r'source'),
       );
@@ -81,7 +87,7 @@ class LevelDTO {
     return null;
   }
 
-  static List<LevelDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<LevelDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <LevelDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -112,12 +118,10 @@ class LevelDTO {
   static Map<String, List<LevelDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<LevelDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = LevelDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = LevelDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/login_dto.dart b/manager_api_new/lib/model/login_dto.dart
index e5543ec..a8e6b90 100644
--- a/manager_api_new/lib/model/login_dto.dart
+++ b/manager_api_new/lib/model/login_dto.dart
@@ -36,14 +36,18 @@ class LoginDTO {
   String toString() => 'LoginDTO[email=$email, password=$password]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (email != null) {
-      _json[r'email'] = email;
+    final json = <String, dynamic>{};
+    if (this.email != null) {
+      json[r'email'] = this.email;
+    } else {
+      json[r'email'] = null;
     }
-    if (password != null) {
-      _json[r'password'] = password;
+    if (this.password != null) {
+      json[r'password'] = this.password;
+    } else {
+      json[r'password'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [LoginDTO] instance and imports its values from
@@ -72,7 +76,7 @@ class LoginDTO {
     return null;
   }
 
-  static List<LoginDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<LoginDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <LoginDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -103,12 +107,10 @@ class LoginDTO {
   static Map<String, List<LoginDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<LoginDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = LoginDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = LoginDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/map_dto.dart b/manager_api_new/lib/model/map_dto.dart
index 8a283e6..b193330 100644
--- a/manager_api_new/lib/model/map_dto.dart
+++ b/manager_api_new/lib/model/map_dto.dart
@@ -63,23 +63,33 @@ class MapDTO {
   String toString() => 'MapDTO[zoom=$zoom, mapType=$mapType, points=$points, iconResourceId=$iconResourceId, iconSource=$iconSource]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (zoom != null) {
-      _json[r'zoom'] = zoom;
+    final json = <String, dynamic>{};
+    if (this.zoom != null) {
+      json[r'zoom'] = this.zoom;
+    } else {
+      json[r'zoom'] = null;
     }
-    if (mapType != null) {
-      _json[r'mapType'] = mapType;
+    if (this.mapType != null) {
+      json[r'mapType'] = this.mapType;
+    } else {
+      json[r'mapType'] = null;
     }
-    if (points != null) {
-      _json[r'points'] = points;
+    if (this.points != null) {
+      json[r'points'] = this.points;
+    } else {
+      json[r'points'] = null;
     }
-    if (iconResourceId != null) {
-      _json[r'iconResourceId'] = iconResourceId;
+    if (this.iconResourceId != null) {
+      json[r'iconResourceId'] = this.iconResourceId;
+    } else {
+      json[r'iconResourceId'] = null;
     }
-    if (iconSource != null) {
-      _json[r'iconSource'] = iconSource;
+    if (this.iconSource != null) {
+      json[r'iconSource'] = this.iconSource;
+    } else {
+      json[r'iconSource'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [MapDTO] instance and imports its values from
@@ -103,7 +113,7 @@ class MapDTO {
       return MapDTO(
         zoom: mapValueOfType<int>(json, r'zoom'),
         mapType: MapTypeApp.fromJson(json[r'mapType']),
-        points: GeoPointDTO.listFromJson(json[r'points']) ?? const [],
+        points: GeoPointDTO.listFromJson(json[r'points']),
         iconResourceId: mapValueOfType<String>(json, r'iconResourceId'),
         iconSource: mapValueOfType<String>(json, r'iconSource'),
       );
@@ -111,7 +121,7 @@ class MapDTO {
     return null;
   }
 
-  static List<MapDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<MapDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <MapDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -142,12 +152,10 @@ class MapDTO {
   static Map<String, List<MapDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<MapDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = MapDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = MapDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/menu_dto.dart b/manager_api_new/lib/model/menu_dto.dart
index feb29a8..0f47549 100644
--- a/manager_api_new/lib/model/menu_dto.dart
+++ b/manager_api_new/lib/model/menu_dto.dart
@@ -31,11 +31,13 @@ class MenuDTO {
   String toString() => 'MenuDTO[sections=$sections]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (sections != null) {
-      _json[r'sections'] = sections;
+    final json = <String, dynamic>{};
+    if (this.sections != null) {
+      json[r'sections'] = this.sections;
+    } else {
+      json[r'sections'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [MenuDTO] instance and imports its values from
@@ -57,13 +59,13 @@ class MenuDTO {
       }());
 
       return MenuDTO(
-        sections: SectionDTO.listFromJson(json[r'sections']) ?? const [],
+        sections: SectionDTO.listFromJson(json[r'sections']),
       );
     }
     return null;
   }
 
-  static List<MenuDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<MenuDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <MenuDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -94,12 +96,10 @@ class MenuDTO {
   static Map<String, List<MenuDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<MenuDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = MenuDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = MenuDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/player_message_dto.dart b/manager_api_new/lib/model/player_message_dto.dart
index c51ce09..9e67106 100644
--- a/manager_api_new/lib/model/player_message_dto.dart
+++ b/manager_api_new/lib/model/player_message_dto.dart
@@ -48,14 +48,18 @@ class PlayerMessageDTO {
   String toString() => 'PlayerMessageDTO[configChanged=$configChanged, isDeleted=$isDeleted]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (configChanged != null) {
-      _json[r'configChanged'] = configChanged;
+    final json = <String, dynamic>{};
+    if (this.configChanged != null) {
+      json[r'configChanged'] = this.configChanged;
+    } else {
+      json[r'configChanged'] = null;
     }
-    if (isDeleted != null) {
-      _json[r'isDeleted'] = isDeleted;
+    if (this.isDeleted != null) {
+      json[r'isDeleted'] = this.isDeleted;
+    } else {
+      json[r'isDeleted'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [PlayerMessageDTO] instance and imports its values from
@@ -84,7 +88,7 @@ class PlayerMessageDTO {
     return null;
   }
 
-  static List<PlayerMessageDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<PlayerMessageDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <PlayerMessageDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -115,12 +119,10 @@ class PlayerMessageDTO {
   static Map<String, List<PlayerMessageDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<PlayerMessageDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = PlayerMessageDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = PlayerMessageDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/question_dto.dart b/manager_api_new/lib/model/question_dto.dart
index 0e7f86b..9d52588 100644
--- a/manager_api_new/lib/model/question_dto.dart
+++ b/manager_api_new/lib/model/question_dto.dart
@@ -57,23 +57,33 @@ class QuestionDTO {
   String toString() => 'QuestionDTO[label=$label, responses=$responses, resourceId=$resourceId, source_=$source_, order=$order]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (label != null) {
-      _json[r'label'] = label;
+    final json = <String, dynamic>{};
+    if (this.label != null) {
+      json[r'label'] = this.label;
+    } else {
+      json[r'label'] = null;
     }
-    if (responses != null) {
-      _json[r'responses'] = responses;
+    if (this.responses != null) {
+      json[r'responses'] = this.responses;
+    } else {
+      json[r'responses'] = null;
     }
-    if (resourceId != null) {
-      _json[r'resourceId'] = resourceId;
+    if (this.resourceId != null) {
+      json[r'resourceId'] = this.resourceId;
+    } else {
+      json[r'resourceId'] = null;
     }
-    if (source_ != null) {
-      _json[r'source'] = source_;
+    if (this.source_ != null) {
+      json[r'source'] = this.source_;
+    } else {
+      json[r'source'] = null;
     }
-    if (order != null) {
-      _json[r'order'] = order;
+    if (this.order != null) {
+      json[r'order'] = this.order;
+    } else {
+      json[r'order'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [QuestionDTO] instance and imports its values from
@@ -95,8 +105,8 @@ class QuestionDTO {
       }());
 
       return QuestionDTO(
-        label: TranslationDTO.listFromJson(json[r'label']) ?? const [],
-        responses: ResponseDTO.listFromJson(json[r'responses']) ?? const [],
+        label: TranslationDTO.listFromJson(json[r'label']),
+        responses: ResponseDTO.listFromJson(json[r'responses']),
         resourceId: mapValueOfType<String>(json, r'resourceId'),
         source_: mapValueOfType<String>(json, r'source'),
         order: mapValueOfType<int>(json, r'order'),
@@ -105,7 +115,7 @@ class QuestionDTO {
     return null;
   }
 
-  static List<QuestionDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<QuestionDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <QuestionDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -136,12 +146,10 @@ class QuestionDTO {
   static Map<String, List<QuestionDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<QuestionDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = QuestionDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = QuestionDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/quizz_dto.dart b/manager_api_new/lib/model/quizz_dto.dart
index e9e8ded..cf3c308 100644
--- a/manager_api_new/lib/model/quizz_dto.dart
+++ b/manager_api_new/lib/model/quizz_dto.dart
@@ -51,23 +51,33 @@ class QuizzDTO {
   String toString() => 'QuizzDTO[questions=$questions, badLevel=$badLevel, mediumLevel=$mediumLevel, goodLevel=$goodLevel, greatLevel=$greatLevel]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (questions != null) {
-      _json[r'questions'] = questions;
+    final json = <String, dynamic>{};
+    if (this.questions != null) {
+      json[r'questions'] = this.questions;
+    } else {
+      json[r'questions'] = null;
     }
-    if (badLevel != null) {
-      _json[r'bad_level'] = badLevel;
+    if (this.badLevel != null) {
+      json[r'bad_level'] = this.badLevel;
+    } else {
+      json[r'bad_level'] = null;
     }
-    if (mediumLevel != null) {
-      _json[r'medium_level'] = mediumLevel;
+    if (this.mediumLevel != null) {
+      json[r'medium_level'] = this.mediumLevel;
+    } else {
+      json[r'medium_level'] = null;
     }
-    if (goodLevel != null) {
-      _json[r'good_level'] = goodLevel;
+    if (this.goodLevel != null) {
+      json[r'good_level'] = this.goodLevel;
+    } else {
+      json[r'good_level'] = null;
     }
-    if (greatLevel != null) {
-      _json[r'great_level'] = greatLevel;
+    if (this.greatLevel != null) {
+      json[r'great_level'] = this.greatLevel;
+    } else {
+      json[r'great_level'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [QuizzDTO] instance and imports its values from
@@ -99,7 +109,7 @@ class QuizzDTO {
     return null;
   }
 
-  static List<QuizzDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<QuizzDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <QuizzDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -130,12 +140,10 @@ class QuizzDTO {
   static Map<String, List<QuizzDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<QuizzDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = QuizzDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = QuizzDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/quizz_dto_bad_level.dart b/manager_api_new/lib/model/quizz_dto_bad_level.dart
index f18f478..af82dd0 100644
--- a/manager_api_new/lib/model/quizz_dto_bad_level.dart
+++ b/manager_api_new/lib/model/quizz_dto_bad_level.dart
@@ -41,17 +41,23 @@ class QuizzDTOBadLevel {
   String toString() => 'QuizzDTOBadLevel[label=$label, resourceId=$resourceId, source_=$source_]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (label != null) {
-      _json[r'label'] = label;
+    final json = <String, dynamic>{};
+    if (this.label != null) {
+      json[r'label'] = this.label;
+    } else {
+      json[r'label'] = null;
     }
-    if (resourceId != null) {
-      _json[r'resourceId'] = resourceId;
+    if (this.resourceId != null) {
+      json[r'resourceId'] = this.resourceId;
+    } else {
+      json[r'resourceId'] = null;
     }
-    if (source_ != null) {
-      _json[r'source'] = source_;
+    if (this.source_ != null) {
+      json[r'source'] = this.source_;
+    } else {
+      json[r'source'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [QuizzDTOBadLevel] instance and imports its values from
@@ -73,7 +79,7 @@ class QuizzDTOBadLevel {
       }());
 
       return QuizzDTOBadLevel(
-        label: TranslationDTO.listFromJson(json[r'label']) ?? const [],
+        label: TranslationDTO.listFromJson(json[r'label']),
         resourceId: mapValueOfType<String>(json, r'resourceId'),
         source_: mapValueOfType<String>(json, r'source'),
       );
@@ -81,7 +87,7 @@ class QuizzDTOBadLevel {
     return null;
   }
 
-  static List<QuizzDTOBadLevel>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<QuizzDTOBadLevel> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <QuizzDTOBadLevel>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -112,12 +118,10 @@ class QuizzDTOBadLevel {
   static Map<String, List<QuizzDTOBadLevel>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<QuizzDTOBadLevel>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = QuizzDTOBadLevel.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = QuizzDTOBadLevel.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/resource_dto.dart b/manager_api_new/lib/model/resource_dto.dart
index 72a3f52..551145c 100644
--- a/manager_api_new/lib/model/resource_dto.dart
+++ b/manager_api_new/lib/model/resource_dto.dart
@@ -68,26 +68,38 @@ class ResourceDTO {
   String toString() => 'ResourceDTO[id=$id, type=$type, label=$label, data=$data, dateCreation=$dateCreation, instanceId=$instanceId]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (id != null) {
-      _json[r'id'] = id;
+    final json = <String, dynamic>{};
+    if (this.id != null) {
+      json[r'id'] = this.id;
+    } else {
+      json[r'id'] = null;
     }
-    if (type != null) {
-      _json[r'type'] = type;
+    if (this.type != null) {
+      json[r'type'] = this.type;
+    } else {
+      json[r'type'] = null;
     }
-    if (label != null) {
-      _json[r'label'] = label;
+    if (this.label != null) {
+      json[r'label'] = this.label;
+    } else {
+      json[r'label'] = null;
     }
-    if (data != null) {
-      _json[r'data'] = data;
+    if (this.data != null) {
+      json[r'data'] = this.data;
+    } else {
+      json[r'data'] = null;
     }
-    if (dateCreation != null) {
-      _json[r'dateCreation'] = dateCreation!.toUtc().toIso8601String();
+    if (this.dateCreation != null) {
+      json[r'dateCreation'] = this.dateCreation!.toUtc().toIso8601String();
+    } else {
+      json[r'dateCreation'] = null;
     }
-    if (instanceId != null) {
-      _json[r'instanceId'] = instanceId;
+    if (this.instanceId != null) {
+      json[r'instanceId'] = this.instanceId;
+    } else {
+      json[r'instanceId'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [ResourceDTO] instance and imports its values from
@@ -120,7 +132,7 @@ class ResourceDTO {
     return null;
   }
 
-  static List<ResourceDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<ResourceDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <ResourceDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -151,12 +163,10 @@ class ResourceDTO {
   static Map<String, List<ResourceDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<ResourceDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = ResourceDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = ResourceDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/response_dto.dart b/manager_api_new/lib/model/response_dto.dart
index 266f6a9..df2f4cd 100644
--- a/manager_api_new/lib/model/response_dto.dart
+++ b/manager_api_new/lib/model/response_dto.dart
@@ -53,17 +53,23 @@ class ResponseDTO {
   String toString() => 'ResponseDTO[label=$label, isGood=$isGood, order=$order]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (label != null) {
-      _json[r'label'] = label;
+    final json = <String, dynamic>{};
+    if (this.label != null) {
+      json[r'label'] = this.label;
+    } else {
+      json[r'label'] = null;
     }
-    if (isGood != null) {
-      _json[r'isGood'] = isGood;
+    if (this.isGood != null) {
+      json[r'isGood'] = this.isGood;
+    } else {
+      json[r'isGood'] = null;
     }
-    if (order != null) {
-      _json[r'order'] = order;
+    if (this.order != null) {
+      json[r'order'] = this.order;
+    } else {
+      json[r'order'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [ResponseDTO] instance and imports its values from
@@ -85,7 +91,7 @@ class ResponseDTO {
       }());
 
       return ResponseDTO(
-        label: TranslationDTO.listFromJson(json[r'label']) ?? const [],
+        label: TranslationDTO.listFromJson(json[r'label']),
         isGood: mapValueOfType<bool>(json, r'isGood'),
         order: mapValueOfType<int>(json, r'order'),
       );
@@ -93,7 +99,7 @@ class ResponseDTO {
     return null;
   }
 
-  static List<ResponseDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<ResponseDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <ResponseDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -124,12 +130,10 @@ class ResponseDTO {
   static Map<String, List<ResponseDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<ResponseDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = ResponseDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = ResponseDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/section_dto.dart b/manager_api_new/lib/model/section_dto.dart
index a25824e..977995c 100644
--- a/manager_api_new/lib/model/section_dto.dart
+++ b/manager_api_new/lib/model/section_dto.dart
@@ -151,65 +151,103 @@ class SectionDTO {
   String toString() => 'SectionDTO[id=$id, label=$label, title=$title, description=$description, imageId=$imageId, imageSource=$imageSource, configurationId=$configurationId, isSubSection=$isSubSection, parentId=$parentId, type=$type, data=$data, dateCreation=$dateCreation, order=$order, instanceId=$instanceId, latitude=$latitude, longitude=$longitude, meterZoneGPS=$meterZoneGPS, isBeacon=$isBeacon, beaconId=$beaconId]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (id != null) {
-      _json[r'id'] = id;
+    final json = <String, dynamic>{};
+    if (this.id != null) {
+      json[r'id'] = this.id;
+    } else {
+      json[r'id'] = null;
     }
-    if (label != null) {
-      _json[r'label'] = label;
+    if (this.label != null) {
+      json[r'label'] = this.label;
+    } else {
+      json[r'label'] = null;
     }
-    if (title != null) {
-      _json[r'title'] = title;
+    if (this.title != null) {
+      json[r'title'] = this.title;
+    } else {
+      json[r'title'] = null;
     }
-    if (description != null) {
-      _json[r'description'] = description;
+    if (this.description != null) {
+      json[r'description'] = this.description;
+    } else {
+      json[r'description'] = null;
     }
-    if (imageId != null) {
-      _json[r'imageId'] = imageId;
+    if (this.imageId != null) {
+      json[r'imageId'] = this.imageId;
+    } else {
+      json[r'imageId'] = null;
     }
-    if (imageSource != null) {
-      _json[r'imageSource'] = imageSource;
+    if (this.imageSource != null) {
+      json[r'imageSource'] = this.imageSource;
+    } else {
+      json[r'imageSource'] = null;
     }
-    if (configurationId != null) {
-      _json[r'configurationId'] = configurationId;
+    if (this.configurationId != null) {
+      json[r'configurationId'] = this.configurationId;
+    } else {
+      json[r'configurationId'] = null;
     }
-    if (isSubSection != null) {
-      _json[r'isSubSection'] = isSubSection;
+    if (this.isSubSection != null) {
+      json[r'isSubSection'] = this.isSubSection;
+    } else {
+      json[r'isSubSection'] = null;
     }
-    if (parentId != null) {
-      _json[r'parentId'] = parentId;
+    if (this.parentId != null) {
+      json[r'parentId'] = this.parentId;
+    } else {
+      json[r'parentId'] = null;
     }
-    if (type != null) {
-      _json[r'type'] = type;
+    if (this.type != null) {
+      json[r'type'] = this.type;
+    } else {
+      json[r'type'] = null;
     }
-    if (data != null) {
-      _json[r'data'] = data;
+    if (this.data != null) {
+      json[r'data'] = this.data;
+    } else {
+      json[r'data'] = null;
     }
-    if (dateCreation != null) {
-      _json[r'dateCreation'] = dateCreation!.toUtc().toIso8601String();
+    if (this.dateCreation != null) {
+      json[r'dateCreation'] = this.dateCreation!.toUtc().toIso8601String();
+    } else {
+      json[r'dateCreation'] = null;
     }
-    if (order != null) {
-      _json[r'order'] = order;
+    if (this.order != null) {
+      json[r'order'] = this.order;
+    } else {
+      json[r'order'] = null;
     }
-    if (instanceId != null) {
-      _json[r'instanceId'] = instanceId;
+    if (this.instanceId != null) {
+      json[r'instanceId'] = this.instanceId;
+    } else {
+      json[r'instanceId'] = null;
     }
-    if (latitude != null) {
-      _json[r'latitude'] = latitude;
+    if (this.latitude != null) {
+      json[r'latitude'] = this.latitude;
+    } else {
+      json[r'latitude'] = null;
     }
-    if (longitude != null) {
-      _json[r'longitude'] = longitude;
+    if (this.longitude != null) {
+      json[r'longitude'] = this.longitude;
+    } else {
+      json[r'longitude'] = null;
     }
-    if (meterZoneGPS != null) {
-      _json[r'meterZoneGPS'] = meterZoneGPS;
+    if (this.meterZoneGPS != null) {
+      json[r'meterZoneGPS'] = this.meterZoneGPS;
+    } else {
+      json[r'meterZoneGPS'] = null;
     }
-    if (isBeacon != null) {
-      _json[r'isBeacon'] = isBeacon;
+    if (this.isBeacon != null) {
+      json[r'isBeacon'] = this.isBeacon;
+    } else {
+      json[r'isBeacon'] = null;
     }
-    if (beaconId != null) {
-      _json[r'beaconId'] = beaconId;
+    if (this.beaconId != null) {
+      json[r'beaconId'] = this.beaconId;
+    } else {
+      json[r'beaconId'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [SectionDTO] instance and imports its values from
@@ -233,8 +271,8 @@ class SectionDTO {
       return SectionDTO(
         id: mapValueOfType<String>(json, r'id'),
         label: mapValueOfType<String>(json, r'label'),
-        title: TranslationDTO.listFromJson(json[r'title']) ?? const [],
-        description: TranslationDTO.listFromJson(json[r'description']) ?? const [],
+        title: TranslationDTO.listFromJson(json[r'title']),
+        description: TranslationDTO.listFromJson(json[r'description']),
         imageId: mapValueOfType<String>(json, r'imageId'),
         imageSource: mapValueOfType<String>(json, r'imageSource'),
         configurationId: mapValueOfType<String>(json, r'configurationId'),
@@ -255,7 +293,7 @@ class SectionDTO {
     return null;
   }
 
-  static List<SectionDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<SectionDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <SectionDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -286,12 +324,10 @@ class SectionDTO {
   static Map<String, List<SectionDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<SectionDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = SectionDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = SectionDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/slider_dto.dart b/manager_api_new/lib/model/slider_dto.dart
index f6ab5ec..6cf9a47 100644
--- a/manager_api_new/lib/model/slider_dto.dart
+++ b/manager_api_new/lib/model/slider_dto.dart
@@ -31,11 +31,13 @@ class SliderDTO {
   String toString() => 'SliderDTO[images=$images]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (images != null) {
-      _json[r'images'] = images;
+    final json = <String, dynamic>{};
+    if (this.images != null) {
+      json[r'images'] = this.images;
+    } else {
+      json[r'images'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [SliderDTO] instance and imports its values from
@@ -57,13 +59,13 @@ class SliderDTO {
       }());
 
       return SliderDTO(
-        images: ImageDTO.listFromJson(json[r'images']) ?? const [],
+        images: ImageDTO.listFromJson(json[r'images']),
       );
     }
     return null;
   }
 
-  static List<SliderDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<SliderDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <SliderDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -94,12 +96,10 @@ class SliderDTO {
   static Map<String, List<SliderDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<SliderDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = SliderDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = SliderDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/token_dto.dart b/manager_api_new/lib/model/token_dto.dart
index 5f89ba2..2f4456d 100644
--- a/manager_api_new/lib/model/token_dto.dart
+++ b/manager_api_new/lib/model/token_dto.dart
@@ -73,29 +73,43 @@ class TokenDTO {
   String toString() => 'TokenDTO[accessToken=$accessToken, refreshToken=$refreshToken, scope=$scope, tokenType=$tokenType, expiresIn=$expiresIn, expiration=$expiration, instanceId=$instanceId]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (accessToken != null) {
-      _json[r'access_token'] = accessToken;
+    final json = <String, dynamic>{};
+    if (this.accessToken != null) {
+      json[r'access_token'] = this.accessToken;
+    } else {
+      json[r'access_token'] = null;
     }
-    if (refreshToken != null) {
-      _json[r'refresh_token'] = refreshToken;
+    if (this.refreshToken != null) {
+      json[r'refresh_token'] = this.refreshToken;
+    } else {
+      json[r'refresh_token'] = null;
     }
-    if (scope != null) {
-      _json[r'scope'] = scope;
+    if (this.scope != null) {
+      json[r'scope'] = this.scope;
+    } else {
+      json[r'scope'] = null;
     }
-    if (tokenType != null) {
-      _json[r'token_type'] = tokenType;
+    if (this.tokenType != null) {
+      json[r'token_type'] = this.tokenType;
+    } else {
+      json[r'token_type'] = null;
     }
-    if (expiresIn != null) {
-      _json[r'expires_in'] = expiresIn;
+    if (this.expiresIn != null) {
+      json[r'expires_in'] = this.expiresIn;
+    } else {
+      json[r'expires_in'] = null;
     }
-    if (expiration != null) {
-      _json[r'expiration'] = expiration!.toUtc().toIso8601String();
+    if (this.expiration != null) {
+      json[r'expiration'] = this.expiration!.toUtc().toIso8601String();
+    } else {
+      json[r'expiration'] = null;
     }
-    if (instanceId != null) {
-      _json[r'instanceId'] = instanceId;
+    if (this.instanceId != null) {
+      json[r'instanceId'] = this.instanceId;
+    } else {
+      json[r'instanceId'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [TokenDTO] instance and imports its values from
@@ -129,7 +143,7 @@ class TokenDTO {
     return null;
   }
 
-  static List<TokenDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<TokenDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <TokenDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -160,12 +174,10 @@ class TokenDTO {
   static Map<String, List<TokenDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<TokenDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = TokenDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = TokenDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/translation_dto.dart b/manager_api_new/lib/model/translation_dto.dart
index bc4c2da..4e324c2 100644
--- a/manager_api_new/lib/model/translation_dto.dart
+++ b/manager_api_new/lib/model/translation_dto.dart
@@ -36,14 +36,18 @@ class TranslationDTO {
   String toString() => 'TranslationDTO[language=$language, value=$value]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (language != null) {
-      _json[r'language'] = language;
+    final json = <String, dynamic>{};
+    if (this.language != null) {
+      json[r'language'] = this.language;
+    } else {
+      json[r'language'] = null;
     }
-    if (value != null) {
-      _json[r'value'] = value;
+    if (this.value != null) {
+      json[r'value'] = this.value;
+    } else {
+      json[r'value'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [TranslationDTO] instance and imports its values from
@@ -72,7 +76,7 @@ class TranslationDTO {
     return null;
   }
 
-  static List<TranslationDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<TranslationDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <TranslationDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -103,12 +107,10 @@ class TranslationDTO {
   static Map<String, List<TranslationDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<TranslationDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = TranslationDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = TranslationDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/user.dart b/manager_api_new/lib/model/user.dart
index e50ca10..c3d7aad 100644
--- a/manager_api_new/lib/model/user.dart
+++ b/manager_api_new/lib/model/user.dart
@@ -72,32 +72,48 @@ class User {
   String toString() => 'User[id=$id, email=$email, password=$password, firstName=$firstName, lastName=$lastName, token=$token, dateCreation=$dateCreation, instanceId=$instanceId]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (id != null) {
-      _json[r'id'] = id;
+    final json = <String, dynamic>{};
+    if (this.id != null) {
+      json[r'id'] = this.id;
+    } else {
+      json[r'id'] = null;
     }
-    if (email != null) {
-      _json[r'email'] = email;
+    if (this.email != null) {
+      json[r'email'] = this.email;
+    } else {
+      json[r'email'] = null;
     }
-    if (password != null) {
-      _json[r'password'] = password;
+    if (this.password != null) {
+      json[r'password'] = this.password;
+    } else {
+      json[r'password'] = null;
     }
-    if (firstName != null) {
-      _json[r'firstName'] = firstName;
+    if (this.firstName != null) {
+      json[r'firstName'] = this.firstName;
+    } else {
+      json[r'firstName'] = null;
     }
-    if (lastName != null) {
-      _json[r'lastName'] = lastName;
+    if (this.lastName != null) {
+      json[r'lastName'] = this.lastName;
+    } else {
+      json[r'lastName'] = null;
     }
-    if (token != null) {
-      _json[r'token'] = token;
+    if (this.token != null) {
+      json[r'token'] = this.token;
+    } else {
+      json[r'token'] = null;
     }
-    if (dateCreation != null) {
-      _json[r'dateCreation'] = dateCreation!.toUtc().toIso8601String();
+    if (this.dateCreation != null) {
+      json[r'dateCreation'] = this.dateCreation!.toUtc().toIso8601String();
+    } else {
+      json[r'dateCreation'] = null;
     }
-    if (instanceId != null) {
-      _json[r'instanceId'] = instanceId;
+    if (this.instanceId != null) {
+      json[r'instanceId'] = this.instanceId;
+    } else {
+      json[r'instanceId'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [User] instance and imports its values from
@@ -132,7 +148,7 @@ class User {
     return null;
   }
 
-  static List<User>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<User> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <User>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -163,12 +179,10 @@ class User {
   static Map<String, List<User>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<User>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = User.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = User.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/user_detail_dto.dart b/manager_api_new/lib/model/user_detail_dto.dart
index 33727ba..d0ce9cf 100644
--- a/manager_api_new/lib/model/user_detail_dto.dart
+++ b/manager_api_new/lib/model/user_detail_dto.dart
@@ -46,20 +46,28 @@ class UserDetailDTO {
   String toString() => 'UserDetailDTO[id=$id, email=$email, firstName=$firstName, lastName=$lastName]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (id != null) {
-      _json[r'id'] = id;
+    final json = <String, dynamic>{};
+    if (this.id != null) {
+      json[r'id'] = this.id;
+    } else {
+      json[r'id'] = null;
     }
-    if (email != null) {
-      _json[r'email'] = email;
+    if (this.email != null) {
+      json[r'email'] = this.email;
+    } else {
+      json[r'email'] = null;
     }
-    if (firstName != null) {
-      _json[r'firstName'] = firstName;
+    if (this.firstName != null) {
+      json[r'firstName'] = this.firstName;
+    } else {
+      json[r'firstName'] = null;
     }
-    if (lastName != null) {
-      _json[r'lastName'] = lastName;
+    if (this.lastName != null) {
+      json[r'lastName'] = this.lastName;
+    } else {
+      json[r'lastName'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [UserDetailDTO] instance and imports its values from
@@ -90,7 +98,7 @@ class UserDetailDTO {
     return null;
   }
 
-  static List<UserDetailDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<UserDetailDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <UserDetailDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -121,12 +129,10 @@ class UserDetailDTO {
   static Map<String, List<UserDetailDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<UserDetailDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = UserDetailDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = UserDetailDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/video_dto.dart b/manager_api_new/lib/model/video_dto.dart
index 49bceae..01540ef 100644
--- a/manager_api_new/lib/model/video_dto.dart
+++ b/manager_api_new/lib/model/video_dto.dart
@@ -31,11 +31,13 @@ class VideoDTO {
   String toString() => 'VideoDTO[source_=$source_]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (source_ != null) {
-      _json[r'source'] = source_;
+    final json = <String, dynamic>{};
+    if (this.source_ != null) {
+      json[r'source'] = this.source_;
+    } else {
+      json[r'source'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [VideoDTO] instance and imports its values from
@@ -63,7 +65,7 @@ class VideoDTO {
     return null;
   }
 
-  static List<VideoDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<VideoDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <VideoDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -94,12 +96,10 @@ class VideoDTO {
   static Map<String, List<VideoDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<VideoDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = VideoDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = VideoDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/lib/model/web_dto.dart b/manager_api_new/lib/model/web_dto.dart
index f5d6fa7..98d5c31 100644
--- a/manager_api_new/lib/model/web_dto.dart
+++ b/manager_api_new/lib/model/web_dto.dart
@@ -31,11 +31,13 @@ class WebDTO {
   String toString() => 'WebDTO[source_=$source_]';
 
   Map<String, dynamic> toJson() {
-    final _json = <String, dynamic>{};
-    if (source_ != null) {
-      _json[r'source'] = source_;
+    final json = <String, dynamic>{};
+    if (this.source_ != null) {
+      json[r'source'] = this.source_;
+    } else {
+      json[r'source'] = null;
     }
-    return _json;
+    return json;
   }
 
   /// Returns a new [WebDTO] instance and imports its values from
@@ -63,7 +65,7 @@ class WebDTO {
     return null;
   }
 
-  static List<WebDTO>? listFromJson(dynamic json, {bool growable = false,}) {
+  static List<WebDTO> listFromJson(dynamic json, {bool growable = false,}) {
     final result = <WebDTO>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
@@ -94,12 +96,10 @@ class WebDTO {
   static Map<String, List<WebDTO>> mapListFromJson(dynamic json, {bool growable = false,}) {
     final map = <String, List<WebDTO>>{};
     if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        final value = WebDTO.listFromJson(entry.value, growable: growable,);
-        if (value != null) {
-          map[entry.key] = value;
-        }
+        map[entry.key] = WebDTO.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
diff --git a/manager_api_new/pubspec.lock b/manager_api_new/pubspec.lock
index 7baaf41..2295a13 100644
--- a/manager_api_new/pubspec.lock
+++ b/manager_api_new/pubspec.lock
@@ -117,10 +117,10 @@ packages:
     dependency: "direct main"
     description:
       name: http
-      sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482"
+      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.5"
+    version: "1.1.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -141,10 +141,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
+      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.17.0"
+    version: "0.18.1"
   io:
     dependency: transitive
     description:
@@ -402,4 +402,4 @@ packages:
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=2.19.0 <4.0.0"
+  dart: ">=3.1.0 <4.0.0"
diff --git a/manager_api_new/pubspec.yaml b/manager_api_new/pubspec.yaml
index 6ab5949..e9b8ecd 100644
--- a/manager_api_new/pubspec.yaml
+++ b/manager_api_new/pubspec.yaml
@@ -7,10 +7,10 @@ version: '1.0.0'
 description: 'OpenAPI API client'
 homepage: 'homepage'
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: ">=3.1.0 <4.0.0"
 dependencies:
-  http: '>=0.13.0 <0.14.0'
-  intl: '^0.17.0'
+  http: '^1.1.0'
+  intl: '^0.18.0'
   meta: '^1.1.8'
 dev_dependencies:
   test: '>=1.16.0 <1.18.0'
diff --git a/pubspec.lock b/pubspec.lock
index ee640b7..612a692 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,42 +5,42 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: "37bb1e815e15fbeefe916e4c941ef070f2f64d15a7eacc3cc0f6e8847b62319c"
+      sha256: "58826e40314219b223f4723dd4205845040161cdc2df3e6a1cdceed5d8165084"
       url: "https://pub.dev"
     source: hosted
-    version: "48.0.0"
+    version: "63.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: c50aea66893c20d44c365d4269983a74a5c1a4055b7b78f38fbf0e24f519b6a2
+      sha256: f85566ec7b3d25cbea60f7dd4f157c5025f2f19233ca4feeed33b616c78a26a3
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "6.1.0"
   archive:
     dependency: transitive
     description:
       name: archive
-      sha256: ed7cc591a948744994714375caf9a2ce89e1d82e8243997c8a2994d57181c212
+      sha256: "7e0d52067d05f2e0324268097ba723b71cb41ac8a6a2b24d1edf9c536b987b03"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.5"
+    version: "3.4.6"
   args:
     dependency: transitive
     description:
       name: args
-      sha256: "139d809800a412ebb26a3892da228b2d0ba36f0ef5d9a82166e5e52ec8d61611"
+      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.4.2"
   asn1lib:
     dependency: transitive
     description:
       name: asn1lib
-      sha256: ab96a1cb3beeccf8145c52e449233fe68364c9641623acd3adad66f8184f1039
+      sha256: "21afe4333076c02877d14f4a89df111e658a6d466cbfc802eb705eb91bd5adfd"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
   async:
     dependency: transitive
     description:
@@ -53,10 +53,10 @@ packages:
     dependency: transitive
     description:
       name: audio_session
-      sha256: e4acc4e9eaa32436dfc5d7aed7f0a370f2d7bb27ee27de30d6c4f220c2a05c73
+      sha256: "8a2bc5e30520e18f3fb0e366793d78057fb64cd5287862c76af0c8771f2a52ad"
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.13"
+    version: "0.1.16"
   auto_size_text:
     dependency: "direct main"
     description:
@@ -69,10 +69,18 @@ packages:
     dependency: transitive
     description:
       name: barcode
-      sha256: "6f4e44699843c336fcb4a14a4f4221f03d21ae47dd8c4ae4c25ffc7b7dd1cfb8"
+      sha256: "789f898eef0bd88312470bdb2cc996f895ad7dd5f89e9adde84b204546a90b45"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.4"
+  bidi:
+    dependency: transitive
+    description:
+      name: bidi
+      sha256: "1a7d0c696324b2089f72e7671fd1f1f64fef44c980f3cebc84e803967c597b63"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.10"
   boolean_selector:
     dependency: transitive
     description:
@@ -85,10 +93,10 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777"
+      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.4.1"
   build_config:
     dependency: transitive
     description:
@@ -101,34 +109,34 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "6bc5544ea6ce4428266e7ea680e945c68806c4aae2da0eb5e9ccf38df8d6acbf"
+      sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "4.0.0"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
-      sha256: "687cf90a3951affac1bd5f9ecb5e3e90b60487f3d9cdc359bb310f8876bb02a6"
+      sha256: "64e12b0521812d1684b1917bc80945625391cb9bdd4312536b1d69dcb6133ed8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.10"
+    version: "2.4.1"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: b0a8a7b8a76c493e85f1b84bffa0588859a06197863dba8c9036b15581fd9727
+      sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.3"
+    version: "2.4.6"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292"
+      sha256: c9e32d21dd6626b5c163d48b037ce906bbe428bc23ab77bcd77bb21e593b6185
       url: "https://pub.dev"
     source: hosted
-    version: "7.2.7"
+    version: "7.2.11"
   built_collection:
     dependency: transitive
     description:
@@ -141,10 +149,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "169565c8ad06adb760c3645bf71f00bff161b00002cace266cad42c5d22a7725"
+      sha256: a8de5955205b4d1dbbbc267daddf2178bd737e4bab8987c04a500478c9651e74
       url: "https://pub.dev"
     source: hosted
-    version: "8.4.3"
+    version: "8.6.3"
   characters:
     dependency: transitive
     description:
@@ -157,10 +165,10 @@ packages:
     dependency: transitive
     description:
       name: checked_yaml
-      sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311"
+      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
   clock:
     dependency: transitive
     description:
@@ -173,18 +181,18 @@ packages:
     dependency: transitive
     description:
       name: code_builder
-      sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe"
+      sha256: "1be9be30396d7e4c0db42c35ea6ccd7cc6a1e19916b5dc64d6ac216b5544d677"
       url: "https://pub.dev"
     source: hosted
-    version: "4.4.0"
+    version: "4.7.0"
   collection:
     dependency: "direct main"
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
   convert:
     dependency: "direct main"
     description:
@@ -197,34 +205,34 @@ packages:
     dependency: transitive
     description:
       name: crypto
-      sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
+      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
+      sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.5"
+    version: "1.0.6"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4"
+      sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.4"
+    version: "2.3.2"
   diacritic:
     dependency: "direct main"
     description:
       name: diacritic
-      sha256: c09a420e737dc036122121fea9f774767e95068f34a17894ee9db30c5bda3075
+      sha256: a84e03ec2779375fb86430dbe9d8fba62c68376f2499097a5f6e75556babe706
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.3"
+    version: "0.1.4"
   drag_and_drop_lists:
     dependency: "direct main"
     description:
@@ -237,10 +245,10 @@ packages:
     dependency: "direct main"
     description:
       name: encrypt
-      sha256: "4fd4e4fdc21b9d7d4141823e1e6515cd94e7b8d84749504c232999fba25d9bbb"
+      sha256: "62d9aa4670cc2a8798bab89b39fc71b6dfbacf615de6cf5001fb39f7e4a996a2"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.1"
+    version: "5.0.3"
   fake_async:
     dependency: transitive
     description:
@@ -253,34 +261,34 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978
+      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.1.0"
   file:
     dependency: transitive
     description:
       name: file
-      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.4"
+    version: "7.0.0"
   file_picker:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: e6c7ad8e572379df86ea64ef0a5395889fba3954411d47ca021b888d79f8e798
+      sha256: "903dd4ba13eae7cef64acc480e91bf54c3ddd23b5b90b639c170f3911e489620"
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.11"
+    version: "6.0.0"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      sha256: "04be3e934c52e082558cc9ee21f42f5c1cd7a1262f4c63cd0357c08d5bba81ec"
+      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0"
   flare_flutter:
     dependency: "direct main"
     description:
@@ -298,66 +306,18 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_colorpicker
-      sha256: "0bb8b140aa387fa924c11f047654e301c6a76f54f88895a2a5419a26f4f38f4f"
+      sha256: "458a6ed8ea480eb16ff892aedb4b7092b2804affd7e046591fb03127e8d8ef8b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.1"
-  flutter_keyboard_visibility:
-    dependency: transitive
-    description:
-      name: flutter_keyboard_visibility
-      sha256: "4983655c26ab5b959252ee204c2fffa4afeb4413cd030455194ec0caa3b8e7cb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.4.1"
-  flutter_keyboard_visibility_linux:
-    dependency: transitive
-    description:
-      name: flutter_keyboard_visibility_linux
-      sha256: "6fba7cd9bb033b6ddd8c2beb4c99ad02d728f1e6e6d9b9446667398b2ac39f08"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  flutter_keyboard_visibility_macos:
-    dependency: transitive
-    description:
-      name: flutter_keyboard_visibility_macos
-      sha256: c5c49b16fff453dfdafdc16f26bdd8fb8d55812a1d50b0ce25fc8d9f2e53d086
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-  flutter_keyboard_visibility_platform_interface:
-    dependency: transitive
-    description:
-      name: flutter_keyboard_visibility_platform_interface
-      sha256: e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  flutter_keyboard_visibility_web:
-    dependency: transitive
-    description:
-      name: flutter_keyboard_visibility_web
-      sha256: d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  flutter_keyboard_visibility_windows:
-    dependency: transitive
-    description:
-      name: flutter_keyboard_visibility_windows
-      sha256: fc4b0f0b6be9b93ae527f3d527fb56ee2d918cd88bbca438c478af7bcfd0ef73
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
+    version: "1.0.3"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: c224ac897bed083dabf11f238dd11a239809b446740be0c2044608c50029ffdf
+      sha256: b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.9"
+    version: "2.0.17"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -380,26 +340,26 @@ packages:
     dependency: transitive
     description:
       name: glob
-      sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c"
+      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   graphs:
     dependency: transitive
     description:
       name: graphs
-      sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2
+      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.1"
   http:
     dependency: transitive
     description:
       name: http
-      sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482"
+      sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525"
       url: "https://pub.dev"
     source: hosted
-    version: "0.13.5"
+    version: "1.1.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -420,18 +380,18 @@ packages:
     dependency: transitive
     description:
       name: image
-      sha256: "02bafd3b4f399bfeb10034deba9753d93b55ce41cd0c4d3d8b355626f80e5b32"
+      sha256: "028f61960d56f26414eb616b48b04eb37d700cbe477b7fb09bf1d7ce57fd9271"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.3"
+    version: "4.1.3"
   intl:
     dependency: transitive
     description:
       name: intl
-      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
+      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.17.0"
+    version: "0.18.1"
   io:
     dependency: transitive
     description:
@@ -452,42 +412,66 @@ packages:
     dependency: transitive
     description:
       name: json_annotation
-      sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317
+      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.0"
+    version: "4.8.1"
   just_audio:
     dependency: "direct main"
     description:
       name: just_audio
-      sha256: "7e6d31508dacd01a066e3889caf6282e5f1eb60707c230203b21a83af5c55586"
+      sha256: "5ed0cd723e17dfd8cd4b0253726221e67f6546841ea4553635cf895061fc335b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.32"
+    version: "0.9.35"
   just_audio_platform_interface:
     dependency: transitive
     description:
       name: just_audio_platform_interface
-      sha256: eff112d5138bea3ba544b6338b1e0537a32b5e1425e4d0dc38f732771cda7c84
+      sha256: d8409da198bbc59426cd45d4c92fca522a2ec269b576ce29459d6d6fcaeb44df
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.0"
+    version: "4.2.1"
   just_audio_web:
     dependency: transitive
     description:
       name: just_audio_web
-      sha256: "89d8db6f19f3821bb6bf908c4bfb846079afb2ab575b783d781a6bf119e3abaf"
+      sha256: ff62f733f437b25a0ff590f0e295fa5441dcb465f1edbdb33b3dea264705bc13
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.7"
+    version: "0.4.8"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: f38a2c91c12f31726ca13015fbab3d2e9440edcb7c17b8b36ed9b85ed6eee6a2
+      url: "https://pub.dev"
+    source: hosted
+    version: "9.0.11"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "23770c69594f5260a79fe9d84e29f8b175d1b05d128e751c904b3cdf910e5dfc"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.9"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: b06739349ec2477e943055aea30172c5c7000225f79dad4702e2ec0eda79a6ff
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.5"
   logging:
     dependency: transitive
     description:
       name: logging
-      sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d"
+      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.2.0"
   manager_api_new:
     dependency: "direct main"
     description:
@@ -507,26 +491,26 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.8.0"
   material_segmented_control:
     dependency: "direct main"
     description:
       name: material_segmented_control
-      sha256: "32e6c9bd804218853782820cdd51d9d23eb1ef7b85a9229b9d5c911edd463206"
+      sha256: "1c3f4b1eacfdb85ff0b1e917fc70a0fadcfcfc4d33353231fce2be5b062a0beb"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "5.0.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.11.0"
   mime:
     dependency: transitive
     description:
@@ -563,26 +547,26 @@ packages:
     dependency: "direct dev"
     description:
       name: openapi_generator
-      sha256: "2c9cf35d91a26330f09ec4a2370f07c5e3040921bd3f33751ba36ac4d2346dc0"
+      sha256: "77d150d227677d9099f26b20dd2cf70f84265de952e9eec345bd201540964aaf"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "4.13.1"
   openapi_generator_annotations:
     dependency: transitive
     description:
       name: openapi_generator_annotations
-      sha256: "1745b86b57943c5a09647c37dd909da61060ad65a0d3d3e48bef58f9c1eebb32"
+      sha256: "46f1fb675029d78e19ce9143e70ce414d738b0f6c45c49c004b4b3afdb405a5c"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "4.13.1"
   openapi_generator_cli:
     dependency: transitive
     description:
       name: openapi_generator_cli
-      sha256: "5d558ea599202dc487f829193b0ba0f28a0e7ad559e819a611b2146ef20c77f5"
+      sha256: e16968c99f7fbc02cfc06494a2eb93b68f95073b1b53010dc0709f8759657654
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "4.13.1"
   package_config:
     dependency: transitive
     description:
@@ -595,10 +579,10 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: de41e74b0ea9a3e524c68f35099af1fdeb4885625aeb277d2e01a42d6bd7b293
+      sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "4.2.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -635,106 +619,106 @@ packages:
     dependency: transitive
     description:
       name: path_parsing
-      sha256: ee5c47c1058ad66b4a41746ec3996af9593d0858872807bcd64ac118f0700337
+      sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.1"
+    version: "1.0.1"
   path_provider:
     dependency: transitive
     description:
       name: path_provider
-      sha256: dcea5feb97d8abf90cab9e9030b497fb7c3cbf26b7a1fe9e3ef7dcb0a1ddec95
+      sha256: a1aa8aaa2542a6bc57e381f132af822420216c80d4781f7aa085ca3229208aaa
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.12"
+    version: "2.1.1"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: a776c088d671b27f6e3aa8881d64b87b3e80201c64e8869b811325de7a76c15e
+      sha256: e595b98692943b4881b219f0a9e3945118d3c16bd7e2813f98ec6e532d905f72
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.22"
+    version: "2.2.1"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "62a68e7e1c6c459f9289859e2fae58290c981ce21d1697faf54910fe1faa4c74"
+      sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.3.1"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379
+      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.7"
+    version: "2.2.1"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: f0abc8ebd7253741f05488b4813d936b4d07c6bae3e86148a09e342ee4b08e76
+      sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.5"
+    version: "2.1.1"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: d3f80b32e83ec208ac95253e0cd4d298e104fbc63cb29c5c69edaed43b0c69d6
+      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.6"
+    version: "2.2.1"
   pdf:
     dependency: "direct main"
     description:
       name: pdf
-      sha256: "51d855ffc6ba3bd029f279590134230d4243b35a2cc9d54b3101ec6ef69ef572"
+      sha256: "9f75fc7f5580ea5e635b5724de58fb27f684c9ad03ed46fdc1aac768e4557315"
       url: "https://pub.dev"
     source: hosted
-    version: "3.6.4"
+    version: "3.10.4"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4"
+      sha256: eeb2d1428ee7f4170e2bd498827296a18d4e7fc462b71727d111c0ac7707cfa6
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.0"
+    version: "6.0.1"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
+      sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.3"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
+      sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.6"
   pointer_interceptor:
     dependency: transitive
     description:
       name: pointer_interceptor
-      sha256: "6aa680b30d96dccef496933d00208ad25f07e047f644dc98ce03ec6141633a9a"
+      sha256: "7626e034489820fd599380d2bb4d3f4a0a5e3529370b62bfce53ab736b91adb2"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.3+4"
+    version: "0.9.3+6"
   pointycastle:
     dependency: transitive
     description:
       name: pointycastle
-      sha256: db7306cf0249f838d1a24af52b5a5887c5bf7f31d8bb4e827d071dc0939ad346
+      sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c"
       url: "https://pub.dev"
     source: hosted
-    version: "3.6.2"
+    version: "3.7.3"
   pool:
     dependency: transitive
     description:
@@ -743,14 +727,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.1"
-  process:
-    dependency: transitive
-    description:
-      name: process
-      sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.2.4"
   provider:
     dependency: "direct main"
     description:
@@ -763,50 +739,50 @@ packages:
     dependency: transitive
     description:
       name: pub_semver
-      sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17"
+      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.4"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: "75f6614d6dde2dc68948dffbaa4fe5dae32cd700eb9fb763fe11dfb45a3c4d0a"
+      sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.3"
   qr:
     dependency: transitive
     description:
       name: qr
-      sha256: "5c4208b4dc0d55c3184d10d83ee0ded6212dc2b5e2ba17c5a0c0aab279128d21"
+      sha256: "64957a3930367bf97cc211a5af99551d630f2f4625e38af10edd6b19131b64b3"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "3.0.1"
   qr_flutter:
     dependency: "direct main"
     description:
       name: qr_flutter
-      sha256: c5c121c54cb6dd837b9b9d57eb7bc7ec6df4aee741032060c8833a678c80b87e
+      sha256: "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "4.1.0"
   quill_html_editor:
     dependency: "direct main"
     description:
       name: quill_html_editor
-      sha256: "16d09a35742aaa0059c1a332ab2cef4570c22053495d1b9dafd9d2573b837d94"
+      sha256: e8cc612f97a6368299c3cfa292e312efebb768c6478f075bc2bdafe2aa87831a
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.9"
+    version: "2.2.7"
   responsive_framework:
     dependency: "direct main"
     description:
       name: responsive_framework
-      sha256: "97d4a8b9468c0ecaafe8566645d70cc59480e4b03704a1b936396e68775e2c34"
+      sha256: "23aa7be5d5136922df708f6ddccb5ec4e0eb8bc576c3f105f5093f31d6b68e50"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   rxdart:
     dependency: "direct main"
     description:
@@ -819,18 +795,18 @@ packages:
     dependency: transitive
     description:
       name: shelf
-      sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c
+      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.4.1"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8
+      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -840,10 +816,10 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      sha256: "2d79738b6bbf38a43920e2b8d189e9a3ce6cc201f4b8fc76be5e4fe377b1c38d"
+      sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.6"
+    version: "1.4.0"
   source_span:
     dependency: transitive
     description:
@@ -852,22 +828,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.10.0"
+  sprintf:
+    dependency: transitive
+    description:
+      name: sprintf
+      sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   stream_transform:
     dependency: transitive
     description:
@@ -896,10 +880,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.6.1"
   timing:
     dependency: transitive
     description:
@@ -912,18 +896,18 @@ packages:
     dependency: transitive
     description:
       name: typed_data
-      sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5"
+      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.2"
   uuid:
     dependency: transitive
     description:
       name: uuid
-      sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
+      sha256: b715b8d3858b6fa9f68f87d20d98830283628014750c2b09b6f516c1da4af2a7
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.7"
+    version: "4.1.0"
   vector_math:
     dependency: transitive
     description:
@@ -932,94 +916,102 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: a13d5503b4facefc515c8c587ce3cf69577a7b064a9f1220e005449cf1f64aad
+      url: "https://pub.dev"
+    source: hosted
+    version: "12.0.0"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0"
+      sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.1.0"
   web:
     dependency: transitive
     description:
       name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4-beta"
+    version: "0.3.0"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: ca49c0bc209c687b887f30527fb6a9d80040b072cc2990f34b9bec3e7663101b
+      sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.4.0"
   webview_flutter:
     dependency: transitive
     description:
       name: webview_flutter
-      sha256: "789d52bd789373cc1e100fb634af2127e86c99cf9abde09499743270c5de8d00"
+      sha256: c1ab9b81090705c6069197d9fdc1625e587b52b8d70cdde2339d177ad0dbb98e
       url: "https://pub.dev"
     source: hosted
-    version: "4.2.2"
+    version: "4.4.1"
   webview_flutter_android:
     dependency: transitive
     description:
       name: webview_flutter_android
-      sha256: "532135f6f6b8030cd039f30eab23f340d650350e29f38e9b37d2eaad028f1018"
+      sha256: b0cd33dd7d3dd8e5f664e11a19e17ba12c352647269921a3b568406b001f1dff
       url: "https://pub.dev"
     source: hosted
-    version: "3.8.0"
+    version: "3.12.0"
   webview_flutter_platform_interface:
     dependency: transitive
     description:
       name: webview_flutter_platform_interface
-      sha256: "656e2aeaef318900fffd21468b6ddc7958c7092a642f0e7220bac328b70d4a81"
+      sha256: "6d9213c65f1060116757a7c473247c60f3f7f332cac33dc417c9e362a9a13e4f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.6.0"
   webview_flutter_wkwebview:
     dependency: transitive
     description:
       name: webview_flutter_wkwebview
-      sha256: ecc9e9ea15216afc5ba3b1f14aa19414ceba526e57b19cebd970bfa91a0f4058
+      sha256: b4b42295b3aa91ed22ba6d3dd7de56efbb8f3ab3d6e41d8b1615d13537c7801d
       url: "https://pub.dev"
     source: hosted
-    version: "3.5.0"
+    version: "3.9.2"
   win32:
     dependency: transitive
     description:
       name: win32
-      sha256: dd8f9344bc305ae2923e3d11a2a911d9a4e2c7dd6fe0ed10626d63211a69676e
+      sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3"
       url: "https://pub.dev"
     source: hosted
-    version: "4.1.3"
+    version: "5.0.9"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: bd512f03919aac5f1313eb8249f223bacf4927031bf60b02601f81f687689e86
+      sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2"
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0+3"
+    version: "1.0.3"
   xml:
     dependency: transitive
     description:
       name: xml
-      sha256: "80d494c09849dc3f899d227a78c30c5b949b985ededf884cb3f3bcd39f4b447a"
+      sha256: af5e77e9b83f2f4adc5d3f0a4ece1c7f45a2467b695c2540381bac793e34e556
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.1"
+    version: "6.4.2"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370"
+      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.2"
 sdks:
-  dart: ">=3.1.0-185.0.dev <3.2.0"
-  flutter: ">=3.7.0"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
+  flutter: ">=3.13.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 1c81910..825ad8f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 version: 1.0.2+3
 
 environment:
-  sdk: ">=2.16.2 <3.2.0"
+  sdk: ">=3.1.0 <4.0.0"
 
 dependencies:
   flutter:
@@ -27,47 +27,47 @@ dependencies:
   rxdart:
   provider:
   auto_size_text:
-  flutter_colorpicker: ^0.6.0
-  multiselect_formfield: ^0.1.6
-  material_segmented_control: ^3.1.2
-  convert: ^3.0.0
+  flutter_colorpicker: ^1.0.3
+  multiselect_formfield: ^0.1.7
+  material_segmented_control: ^5.0.0
+  convert: ^3.1.1
   collection: any
   #filepicker_windows: ^2.0.0
-  file_picker: ^5.2.11
+  file_picker: ^6.0.0
   flare_flutter: ^3.0.1
   #dart_vlc: ^0.0.6
   #video_player: ^2.1.1
   drag_and_drop_lists: ^0.3.2
   #path_provider: ^2.0.2
-  encrypt: ^5.0.0
-  qr_flutter: ^4.0.0
-  just_audio: ^0.9.31
-  pdf: ^3.6.0
-  multi_select_flutter: ^4.1.2
+  encrypt: ^5.0.3
+  qr_flutter: ^4.1.0
+  just_audio: ^0.9.35
+  pdf: ^3.10.4
+  multi_select_flutter: ^4.1.3
   #msix: ^2.1.3
   #window_size:
     #  git:
     #    url: git://github.com/google/flutter-desktop-embedding.git
     #    path: plugins/window_size
   #    ref: 927f8cbc09b35d85245c095f2db8df9b186f6618
-  password_credential: ^0.3.1
-  diacritic: ^0.1.3
+  password_credential: ^0.3.2
+  diacritic: ^0.1.4
   pasteboard: ^0.2.0
-  package_info_plus: ^3.1.1
+  package_info_plus: ^4.2.0
   manager_api_new:
     path: manager_api_new
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
-  cupertino_icons: ^1.0.2
-  quill_html_editor: ^2.1.9
-  responsive_framework: ^1.1.0
+  cupertino_icons: ^1.0.6
+  quill_html_editor: ^2.2.7
+  responsive_framework: ^1.1.1
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
   build_runner:
-  openapi_generator: ^4.0.0
+  openapi_generator: ^4.13.1
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec