diff --git a/README.md b/README.md
index bcb0957..3350fee 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,8 @@ A (unofficial) prismic.io integration for Dart and Flutter.
 
 | Code | Pub |
 | ---- | --- |
-| [flusmic](https://github.com/PixelaGt/flusmic/tree/master/packages/flusmic) | [![pub](https://img.shields.io/badge/pub-3.2.3-blue)](https://pub.dev/packages/flusmic) |
-| [flusmic_ui](https://github.com/PixelaGt/flusmic/tree/master/packages/flusmic_ui) | [![pub](https://img.shields.io/badge/pub-3.2.0-blue)](https://pub.dev/packages/flusmic_ui) |
+| [flusmic](https://github.com/PixelaGt/flusmic/tree/master/packages/flusmic) | [![pub](https://img.shields.io/badge/pub-4.0.0-blue)](https://pub.dev/packages/flusmic) |
+| [flusmic_ui](https://github.com/PixelaGt/flusmic/tree/master/packages/flusmic_ui) | [![pub](https://img.shields.io/badge/pub-4.0.0-blue)](https://pub.dev/packages/flusmic_ui) |
 
 
 ## Docs and articles
diff --git a/packages/flusmic_ui/CHANGELOG.md b/packages/flusmic_ui/CHANGELOG.md
index 6b06183..69ea671 100644
--- a/packages/flusmic_ui/CHANGELOG.md
+++ b/packages/flusmic_ui/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [4.0.0]
+* Update `flusmic` to 4.0.0
+* Update dependencies
+* Merged [#35](https://github.com/PixelaGt/flusmic/pull/35) (thanks to @patamimbre)
+
 ## [3.2.0]
 * Update dependencies
 * Fix lint issues
diff --git a/packages/flusmic_ui/README.md b/packages/flusmic_ui/README.md
index 9fd96cc..1360f8a 100644
--- a/packages/flusmic_ui/README.md
+++ b/packages/flusmic_ui/README.md
@@ -1,6 +1,6 @@
 # flusmic_ui
 
-[![pub](https://img.shields.io/badge/pub-3.2.0-blue)](https://pub.dev/packages/flusmic_ui)
+[![pub](https://img.shields.io/badge/pub-4.0.0-blue)](https://pub.dev/packages/flusmic_ui)
 ![flusmic](https://github.com/PixelaGt/flusmic/workflows/flusmic_ui/badge.svg?branch=master&event=push)
 [![codecov](https://codecov.io/gh/PixelaGt/flusmic/branch/master/graph/badge.svg)](https://codecov.io/gh/PixelaGt/flusmic)
 [![Project Status: Active](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
@@ -17,7 +17,7 @@ Add Flusmic in your pubspec.yaml file.
 
 ```yaml
 dependencies:
-  flusmic_ui: 3.2.0 /// latest version
+  flusmic_ui: 4.0.0 /// latest version
 ```
 
 Check [our wiki](https://github.com/PixelaGt/flusmic/wiki/About-Flusmic-ui) to discover more.
diff --git a/packages/flusmic_ui/example/lib/src/model/base/flusmic_test.freezed.dart b/packages/flusmic_ui/example/lib/src/model/base/flusmic_test.freezed.dart
index 9aa7abb..a5f49a3 100644
--- a/packages/flusmic_ui/example/lib/src/model/base/flusmic_test.freezed.dart
+++ b/packages/flusmic_ui/example/lib/src/model/base/flusmic_test.freezed.dart
@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'flusmic_test.dart';
 
@@ -46,7 +46,8 @@ mixin _$FlusmicTest {
 abstract class $FlusmicTestCopyWith<$Res> {
   factory $FlusmicTestCopyWith(
           FlusmicTest value, $Res Function(FlusmicTest) then) =
-      _$FlusmicTestCopyWithImpl<$Res>;
+      _$FlusmicTestCopyWithImpl<$Res, FlusmicTest>;
+  @useResult
   $Res call(
       {List<Richable> title,
       List<Richable> content,
@@ -71,120 +72,127 @@ abstract class $FlusmicTestCopyWith<$Res> {
 }
 
 /// @nodoc
-class _$FlusmicTestCopyWithImpl<$Res> implements $FlusmicTestCopyWith<$Res> {
+class _$FlusmicTestCopyWithImpl<$Res, $Val extends FlusmicTest>
+    implements $FlusmicTestCopyWith<$Res> {
   _$FlusmicTestCopyWithImpl(this._value, this._then);
 
-  final FlusmicTest _value;
   // ignore: unused_field
-  final $Res Function(FlusmicTest) _then;
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
 
+  @pragma('vm:prefer-inline')
   @override
   $Res call({
-    Object? title = freezed,
-    Object? content = freezed,
-    Object? image = freezed,
-    Object? link = freezed,
-    Object? media = freezed,
-    Object? date = freezed,
-    Object? timestamp = freezed,
-    Object? color = freezed,
-    Object? number = freezed,
-    Object? text = freezed,
-    Object? option = freezed,
-    Object? boolean = freezed,
-    Object? location = freezed,
-    Object? repetible = freezed,
-    Object? linked = freezed,
+    Object? title = null,
+    Object? content = null,
+    Object? image = null,
+    Object? link = null,
+    Object? media = null,
+    Object? date = null,
+    Object? timestamp = null,
+    Object? color = null,
+    Object? number = null,
+    Object? text = null,
+    Object? option = null,
+    Object? boolean = null,
+    Object? location = null,
+    Object? repetible = null,
+    Object? linked = null,
   }) {
     return _then(_value.copyWith(
-      title: title == freezed
+      title: null == title
           ? _value.title
           : title // ignore: cast_nullable_to_non_nullable
               as List<Richable>,
-      content: content == freezed
+      content: null == content
           ? _value.content
           : content // ignore: cast_nullable_to_non_nullable
               as List<Richable>,
-      image: image == freezed
+      image: null == image
           ? _value.image
           : image // ignore: cast_nullable_to_non_nullable
               as SimpleImage,
-      link: link == freezed
+      link: null == link
           ? _value.link
           : link // ignore: cast_nullable_to_non_nullable
               as Linkeable,
-      media: media == freezed
+      media: null == media
           ? _value.media
           : media // ignore: cast_nullable_to_non_nullable
               as MediaLinkeable,
-      date: date == freezed
+      date: null == date
           ? _value.date
           : date // ignore: cast_nullable_to_non_nullable
               as String,
-      timestamp: timestamp == freezed
+      timestamp: null == timestamp
           ? _value.timestamp
           : timestamp // ignore: cast_nullable_to_non_nullable
               as String,
-      color: color == freezed
+      color: null == color
           ? _value.color
           : color // ignore: cast_nullable_to_non_nullable
               as String,
-      number: number == freezed
+      number: null == number
           ? _value.number
           : number // ignore: cast_nullable_to_non_nullable
               as double,
-      text: text == freezed
+      text: null == text
           ? _value.text
           : text // ignore: cast_nullable_to_non_nullable
               as String,
-      option: option == freezed
+      option: null == option
           ? _value.option
           : option // ignore: cast_nullable_to_non_nullable
               as String,
-      boolean: boolean == freezed
+      boolean: null == boolean
           ? _value.boolean
           : boolean // ignore: cast_nullable_to_non_nullable
               as bool,
-      location: location == freezed
+      location: null == location
           ? _value.location
           : location // ignore: cast_nullable_to_non_nullable
               as Geopoint,
-      repetible: repetible == freezed
+      repetible: null == repetible
           ? _value.repetible
           : repetible // ignore: cast_nullable_to_non_nullable
               as List<FlusmicNested>,
-      linked: linked == freezed
+      linked: null == linked
           ? _value.linked
           : linked // ignore: cast_nullable_to_non_nullable
               as Linkeable,
-    ));
+    ) as $Val);
   }
 
   @override
+  @pragma('vm:prefer-inline')
   $SimpleImageCopyWith<$Res> get image {
     return $SimpleImageCopyWith<$Res>(_value.image, (value) {
-      return _then(_value.copyWith(image: value));
+      return _then(_value.copyWith(image: value) as $Val);
     });
   }
 
   @override
+  @pragma('vm:prefer-inline')
   $LinkeableCopyWith<$Res> get link {
     return $LinkeableCopyWith<$Res>(_value.link, (value) {
-      return _then(_value.copyWith(link: value));
+      return _then(_value.copyWith(link: value) as $Val);
     });
   }
 
   @override
+  @pragma('vm:prefer-inline')
   $GeopointCopyWith<$Res> get location {
     return $GeopointCopyWith<$Res>(_value.location, (value) {
-      return _then(_value.copyWith(location: value));
+      return _then(_value.copyWith(location: value) as $Val);
     });
   }
 
   @override
+  @pragma('vm:prefer-inline')
   $LinkeableCopyWith<$Res> get linked {
     return $LinkeableCopyWith<$Res>(_value.linked, (value) {
-      return _then(_value.copyWith(linked: value));
+      return _then(_value.copyWith(linked: value) as $Val);
     });
   }
 }
@@ -196,6 +204,7 @@ abstract class _$$_FlusmicTestCopyWith<$Res>
           _$_FlusmicTest value, $Res Function(_$_FlusmicTest) then) =
       __$$_FlusmicTestCopyWithImpl<$Res>;
   @override
+  @useResult
   $Res call(
       {List<Richable> title,
       List<Richable> content,
@@ -224,91 +233,90 @@ abstract class _$$_FlusmicTestCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_FlusmicTestCopyWithImpl<$Res> extends _$FlusmicTestCopyWithImpl<$Res>
+class __$$_FlusmicTestCopyWithImpl<$Res>
+    extends _$FlusmicTestCopyWithImpl<$Res, _$_FlusmicTest>
     implements _$$_FlusmicTestCopyWith<$Res> {
   __$$_FlusmicTestCopyWithImpl(
       _$_FlusmicTest _value, $Res Function(_$_FlusmicTest) _then)
-      : super(_value, (v) => _then(v as _$_FlusmicTest));
-
-  @override
-  _$_FlusmicTest get _value => super._value as _$_FlusmicTest;
+      : super(_value, _then);
 
+  @pragma('vm:prefer-inline')
   @override
   $Res call({
-    Object? title = freezed,
-    Object? content = freezed,
-    Object? image = freezed,
-    Object? link = freezed,
-    Object? media = freezed,
-    Object? date = freezed,
-    Object? timestamp = freezed,
-    Object? color = freezed,
-    Object? number = freezed,
-    Object? text = freezed,
-    Object? option = freezed,
-    Object? boolean = freezed,
-    Object? location = freezed,
-    Object? repetible = freezed,
-    Object? linked = freezed,
+    Object? title = null,
+    Object? content = null,
+    Object? image = null,
+    Object? link = null,
+    Object? media = null,
+    Object? date = null,
+    Object? timestamp = null,
+    Object? color = null,
+    Object? number = null,
+    Object? text = null,
+    Object? option = null,
+    Object? boolean = null,
+    Object? location = null,
+    Object? repetible = null,
+    Object? linked = null,
   }) {
     return _then(_$_FlusmicTest(
-      title: title == freezed
+      title: null == title
           ? _value._title
           : title // ignore: cast_nullable_to_non_nullable
               as List<Richable>,
-      content: content == freezed
+      content: null == content
           ? _value._content
           : content // ignore: cast_nullable_to_non_nullable
               as List<Richable>,
-      image: image == freezed
+      image: null == image
           ? _value.image
           : image // ignore: cast_nullable_to_non_nullable
               as SimpleImage,
-      link: link == freezed
+      link: null == link
           ? _value.link
           : link // ignore: cast_nullable_to_non_nullable
               as Linkeable,
-      media: media == freezed
+      media: null == media
           ? _value.media
           : media // ignore: cast_nullable_to_non_nullable
               as MediaLinkeable,
-      date: date == freezed
+      date: null == date
           ? _value.date
           : date // ignore: cast_nullable_to_non_nullable
               as String,
-      timestamp: timestamp == freezed
+      timestamp: null == timestamp
           ? _value.timestamp
           : timestamp // ignore: cast_nullable_to_non_nullable
               as String,
-      color: color == freezed
+      color: null == color
           ? _value.color
           : color // ignore: cast_nullable_to_non_nullable
               as String,
-      number: number == freezed
+      number: null == number
           ? _value.number
           : number // ignore: cast_nullable_to_non_nullable
               as double,
-      text: text == freezed
+      text: null == text
           ? _value.text
           : text // ignore: cast_nullable_to_non_nullable
               as String,
-      option: option == freezed
+      option: null == option
           ? _value.option
           : option // ignore: cast_nullable_to_non_nullable
               as String,
-      boolean: boolean == freezed
+      boolean: null == boolean
           ? _value.boolean
           : boolean // ignore: cast_nullable_to_non_nullable
               as bool,
-      location: location == freezed
+      location: null == location
           ? _value.location
           : location // ignore: cast_nullable_to_non_nullable
               as Geopoint,
-      repetible: repetible == freezed
+      repetible: null == repetible
           ? _value._repetible
           : repetible // ignore: cast_nullable_to_non_nullable
               as List<FlusmicNested>,
-      linked: linked == freezed
+      linked: null == linked
           ? _value.linked
           : linked // ignore: cast_nullable_to_non_nullable
               as Linkeable,
@@ -345,6 +353,7 @@ class _$_FlusmicTest implements _FlusmicTest {
   final List<Richable> _title;
   @override
   List<Richable> get title {
+    if (_title is EqualUnmodifiableListView) return _title;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(_title);
   }
@@ -352,6 +361,7 @@ class _$_FlusmicTest implements _FlusmicTest {
   final List<Richable> _content;
   @override
   List<Richable> get content {
+    if (_content is EqualUnmodifiableListView) return _content;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(_content);
   }
@@ -381,6 +391,7 @@ class _$_FlusmicTest implements _FlusmicTest {
   final List<FlusmicNested> _repetible;
   @override
   List<FlusmicNested> get repetible {
+    if (_repetible is EqualUnmodifiableListView) return _repetible;
     // ignore: implicit_dynamic_type
     return EqualUnmodifiableListView(_repetible);
   }
@@ -400,20 +411,22 @@ class _$_FlusmicTest implements _FlusmicTest {
             other is _$_FlusmicTest &&
             const DeepCollectionEquality().equals(other._title, _title) &&
             const DeepCollectionEquality().equals(other._content, _content) &&
-            const DeepCollectionEquality().equals(other.image, image) &&
-            const DeepCollectionEquality().equals(other.link, link) &&
-            const DeepCollectionEquality().equals(other.media, media) &&
-            const DeepCollectionEquality().equals(other.date, date) &&
-            const DeepCollectionEquality().equals(other.timestamp, timestamp) &&
-            const DeepCollectionEquality().equals(other.color, color) &&
-            const DeepCollectionEquality().equals(other.number, number) &&
-            const DeepCollectionEquality().equals(other.text, text) &&
-            const DeepCollectionEquality().equals(other.option, option) &&
-            const DeepCollectionEquality().equals(other.boolean, boolean) &&
-            const DeepCollectionEquality().equals(other.location, location) &&
+            (identical(other.image, image) || other.image == image) &&
+            (identical(other.link, link) || other.link == link) &&
+            (identical(other.media, media) || other.media == media) &&
+            (identical(other.date, date) || other.date == date) &&
+            (identical(other.timestamp, timestamp) ||
+                other.timestamp == timestamp) &&
+            (identical(other.color, color) || other.color == color) &&
+            (identical(other.number, number) || other.number == number) &&
+            (identical(other.text, text) || other.text == text) &&
+            (identical(other.option, option) || other.option == option) &&
+            (identical(other.boolean, boolean) || other.boolean == boolean) &&
+            (identical(other.location, location) ||
+                other.location == location) &&
             const DeepCollectionEquality()
                 .equals(other._repetible, _repetible) &&
-            const DeepCollectionEquality().equals(other.linked, linked));
+            (identical(other.linked, linked) || other.linked == linked));
   }
 
   @JsonKey(ignore: true)
@@ -422,28 +435,31 @@ class _$_FlusmicTest implements _FlusmicTest {
       runtimeType,
       const DeepCollectionEquality().hash(_title),
       const DeepCollectionEquality().hash(_content),
-      const DeepCollectionEquality().hash(image),
-      const DeepCollectionEquality().hash(link),
-      const DeepCollectionEquality().hash(media),
-      const DeepCollectionEquality().hash(date),
-      const DeepCollectionEquality().hash(timestamp),
-      const DeepCollectionEquality().hash(color),
-      const DeepCollectionEquality().hash(number),
-      const DeepCollectionEquality().hash(text),
-      const DeepCollectionEquality().hash(option),
-      const DeepCollectionEquality().hash(boolean),
-      const DeepCollectionEquality().hash(location),
+      image,
+      link,
+      media,
+      date,
+      timestamp,
+      color,
+      number,
+      text,
+      option,
+      boolean,
+      location,
       const DeepCollectionEquality().hash(_repetible),
-      const DeepCollectionEquality().hash(linked));
+      linked);
 
   @JsonKey(ignore: true)
   @override
+  @pragma('vm:prefer-inline')
   _$$_FlusmicTestCopyWith<_$_FlusmicTest> get copyWith =>
       __$$_FlusmicTestCopyWithImpl<_$_FlusmicTest>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_FlusmicTestToJson(this);
+    return _$$_FlusmicTestToJson(
+      this,
+    );
   }
 }
 
@@ -469,35 +485,35 @@ abstract class _FlusmicTest implements FlusmicTest {
       _$_FlusmicTest.fromJson;
 
   @override
-  List<Richable> get title => throw _privateConstructorUsedError;
+  List<Richable> get title;
   @override
-  List<Richable> get content => throw _privateConstructorUsedError;
+  List<Richable> get content;
   @override
-  SimpleImage get image => throw _privateConstructorUsedError;
+  SimpleImage get image;
   @override
-  Linkeable get link => throw _privateConstructorUsedError;
+  Linkeable get link;
   @override
-  MediaLinkeable get media => throw _privateConstructorUsedError;
+  MediaLinkeable get media;
   @override
-  String get date => throw _privateConstructorUsedError;
+  String get date;
   @override
-  String get timestamp => throw _privateConstructorUsedError;
+  String get timestamp;
   @override
-  String get color => throw _privateConstructorUsedError;
+  String get color;
   @override
-  double get number => throw _privateConstructorUsedError;
+  double get number;
   @override
-  String get text => throw _privateConstructorUsedError;
+  String get text;
   @override
-  String get option => throw _privateConstructorUsedError;
+  String get option;
   @override
-  bool get boolean => throw _privateConstructorUsedError;
+  bool get boolean;
   @override
-  Geopoint get location => throw _privateConstructorUsedError;
+  Geopoint get location;
   @override
-  List<FlusmicNested> get repetible => throw _privateConstructorUsedError;
+  List<FlusmicNested> get repetible;
   @override
-  Linkeable get linked => throw _privateConstructorUsedError;
+  Linkeable get linked;
   @override
   @JsonKey(ignore: true)
   _$$_FlusmicTestCopyWith<_$_FlusmicTest> get copyWith =>
diff --git a/packages/flusmic_ui/example/lib/src/model/nested/flusmic_nested.freezed.dart b/packages/flusmic_ui/example/lib/src/model/nested/flusmic_nested.freezed.dart
index ff91b8d..1741aeb 100644
--- a/packages/flusmic_ui/example/lib/src/model/nested/flusmic_nested.freezed.dart
+++ b/packages/flusmic_ui/example/lib/src/model/nested/flusmic_nested.freezed.dart
@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'flusmic_nested.dart';
 
@@ -33,34 +33,37 @@ mixin _$FlusmicNested {
 abstract class $FlusmicNestedCopyWith<$Res> {
   factory $FlusmicNestedCopyWith(
           FlusmicNested value, $Res Function(FlusmicNested) then) =
-      _$FlusmicNestedCopyWithImpl<$Res>;
+      _$FlusmicNestedCopyWithImpl<$Res, FlusmicNested>;
+  @useResult
   $Res call({String text1, String text2});
 }
 
 /// @nodoc
-class _$FlusmicNestedCopyWithImpl<$Res>
+class _$FlusmicNestedCopyWithImpl<$Res, $Val extends FlusmicNested>
     implements $FlusmicNestedCopyWith<$Res> {
   _$FlusmicNestedCopyWithImpl(this._value, this._then);
 
-  final FlusmicNested _value;
   // ignore: unused_field
-  final $Res Function(FlusmicNested) _then;
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
 
+  @pragma('vm:prefer-inline')
   @override
   $Res call({
-    Object? text1 = freezed,
-    Object? text2 = freezed,
+    Object? text1 = null,
+    Object? text2 = null,
   }) {
     return _then(_value.copyWith(
-      text1: text1 == freezed
+      text1: null == text1
           ? _value.text1
           : text1 // ignore: cast_nullable_to_non_nullable
               as String,
-      text2: text2 == freezed
+      text2: null == text2
           ? _value.text2
           : text2 // ignore: cast_nullable_to_non_nullable
               as String,
-    ));
+    ) as $Val);
   }
 }
 
@@ -71,31 +74,30 @@ abstract class _$$_FlusmicNestedCopyWith<$Res>
           _$_FlusmicNested value, $Res Function(_$_FlusmicNested) then) =
       __$$_FlusmicNestedCopyWithImpl<$Res>;
   @override
+  @useResult
   $Res call({String text1, String text2});
 }
 
 /// @nodoc
 class __$$_FlusmicNestedCopyWithImpl<$Res>
-    extends _$FlusmicNestedCopyWithImpl<$Res>
+    extends _$FlusmicNestedCopyWithImpl<$Res, _$_FlusmicNested>
     implements _$$_FlusmicNestedCopyWith<$Res> {
   __$$_FlusmicNestedCopyWithImpl(
       _$_FlusmicNested _value, $Res Function(_$_FlusmicNested) _then)
-      : super(_value, (v) => _then(v as _$_FlusmicNested));
-
-  @override
-  _$_FlusmicNested get _value => super._value as _$_FlusmicNested;
+      : super(_value, _then);
 
+  @pragma('vm:prefer-inline')
   @override
   $Res call({
-    Object? text1 = freezed,
-    Object? text2 = freezed,
+    Object? text1 = null,
+    Object? text2 = null,
   }) {
     return _then(_$_FlusmicNested(
-      text1: text1 == freezed
+      text1: null == text1
           ? _value.text1
           : text1 // ignore: cast_nullable_to_non_nullable
               as String,
-      text2: text2 == freezed
+      text2: null == text2
           ? _value.text2
           : text2 // ignore: cast_nullable_to_non_nullable
               as String,
@@ -126,25 +128,25 @@ class _$_FlusmicNested implements _FlusmicNested {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$_FlusmicNested &&
-            const DeepCollectionEquality().equals(other.text1, text1) &&
-            const DeepCollectionEquality().equals(other.text2, text2));
+            (identical(other.text1, text1) || other.text1 == text1) &&
+            (identical(other.text2, text2) || other.text2 == text2));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode => Object.hash(
-      runtimeType,
-      const DeepCollectionEquality().hash(text1),
-      const DeepCollectionEquality().hash(text2));
+  int get hashCode => Object.hash(runtimeType, text1, text2);
 
   @JsonKey(ignore: true)
   @override
+  @pragma('vm:prefer-inline')
   _$$_FlusmicNestedCopyWith<_$_FlusmicNested> get copyWith =>
       __$$_FlusmicNestedCopyWithImpl<_$_FlusmicNested>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_FlusmicNestedToJson(this);
+    return _$$_FlusmicNestedToJson(
+      this,
+    );
   }
 }
 
@@ -157,9 +159,9 @@ abstract class _FlusmicNested implements FlusmicNested {
       _$_FlusmicNested.fromJson;
 
   @override
-  String get text1 => throw _privateConstructorUsedError;
+  String get text1;
   @override
-  String get text2 => throw _privateConstructorUsedError;
+  String get text2;
   @override
   @JsonKey(ignore: true)
   _$$_FlusmicNestedCopyWith<_$_FlusmicNested> get copyWith =>
diff --git a/packages/flusmic_ui/example/pubspec.lock b/packages/flusmic_ui/example/pubspec.lock
index d757ed1..fedb179 100644
--- a/packages/flusmic_ui/example/pubspec.lock
+++ b/packages/flusmic_ui/example/pubspec.lock
@@ -5,240 +5,273 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      url: "https://pub.dartlang.org"
+      sha256: "98d1d33ed129b372846e862de23a0fc365745f4d7b5e786ce667fcbbb7ac5c07"
+      url: "https://pub.dev"
     source: hosted
-    version: "40.0.0"
+    version: "55.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      url: "https://pub.dartlang.org"
+      sha256: "881348aed9b0b425882c97732629a6a31093c8ff20fc4b3b03fb9d3d50a3a126"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "5.7.1"
   args:
     dependency: transitive
     description:
       name: args
-      url: "https://pub.dartlang.org"
+      sha256: ad180a697bf97dd54ab519a4665c57683bf4f70649a18671cea661cf0397c055
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      url: "https://pub.dev"
     source: hosted
-    version: "2.8.2"
+    version: "2.10.0"
   bloc:
     dependency: transitive
     description:
       name: bloc
-      url: "https://pub.dartlang.org"
+      sha256: "658a5ae59edcf1e58aac98b000a71c762ad8f46f1394c34a52050cafb3e11a80"
+      url: "https://pub.dev"
     source: hosted
-    version: "8.0.3"
+    version: "8.1.1"
   bloc_concurrency:
     dependency: transitive
     description:
       name: bloc_concurrency
-      url: "https://pub.dartlang.org"
+      sha256: "9a94e05be7754ec9cfc6e7a68b340be63381a54cadabee25ec3296838646ad3e"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.2.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   build:
     dependency: transitive
     description:
       name: build
-      url: "https://pub.dartlang.org"
+      sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.3.1"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      url: "https://pub.dartlang.org"
+      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.1"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
-      url: "https://pub.dartlang.org"
+      sha256: "6bc5544ea6ce4428266e7ea680e945c68806c4aae2da0eb5e9ccf38df8d6acbf"
+      url: "https://pub.dev"
     source: hosted
     version: "3.1.0"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
-      url: "https://pub.dartlang.org"
+      sha256: db49b8609ef8c81cca2b310618c3017c00f03a92af44c04d310b907b2d692d95
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.9"
+    version: "2.2.0"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      url: "https://pub.dartlang.org"
+      sha256: b0a8a7b8a76c493e85f1b84bffa0588859a06197863dba8c9036b15581fd9727
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.11"
+    version: "2.3.3"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      url: "https://pub.dartlang.org"
+      sha256: f4d6244cc071ba842c296cb1c4ee1b31596b9f924300647ac7a1445493471a3f
+      url: "https://pub.dev"
     source: hosted
     version: "7.2.3"
   built_collection:
     dependency: transitive
     description:
       name: built_collection
-      url: "https://pub.dartlang.org"
+      sha256: f5a2a975d3da1ca46579d2f173bea1c766f0044cff40889c8df8009bf6ea0d0c
+      url: "https://pub.dev"
     source: hosted
     version: "5.0.0"
   built_value:
     dependency: transitive
     description:
       name: built_value
-      url: "https://pub.dartlang.org"
+      sha256: "46de9693ed8ef79e72d9775caf170b5ecae77d7355db49e3dd67de25db60847d"
+      url: "https://pub.dev"
     source: hosted
     version: "8.3.2"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.dartlang.org"
+      sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
   checked_yaml:
     dependency: transitive
     description:
       name: checked_yaml
-      url: "https://pub.dartlang.org"
+      sha256: dd007e4fb8270916820a0d66e24f619266b60773cddd082c6439341645af2659
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   code_builder:
     dependency: transitive
     description:
       name: code_builder
-      url: "https://pub.dartlang.org"
+      sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "4.4.0"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.17.0"
   common_bloc:
     dependency: transitive
     description:
       name: common_bloc
-      url: "https://pub.dartlang.org"
+      sha256: "5b26e5f34c7c4ad13557b68cd7305da8d6ea9e65fc4183560bfb6ba0c36f8441"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.2.2"
+    version: "4.2.4"
   convert:
     dependency: transitive
     description:
       name: convert
-      url: "https://pub.dartlang.org"
+      sha256: df567b950053d83b4dba3e8c5799c411895d146f82b2147114b666a4fd9a80dd
+      url: "https://pub.dev"
     source: hosted
     version: "3.0.0"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      url: "https://pub.dartlang.org"
+      sha256: "8be10341257b613566fdc9fd073c46f7c032ed329b1c732bda17aca29f2366c8"
+      url: "https://pub.dev"
     source: hosted
     version: "3.0.0"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      url: "https://pub.dartlang.org"
+      sha256: "5be16bf1707658e4c03078d4a9b90208ded217fb02c163e207d334082412f2fb"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.2.3"
+    version: "2.2.5"
   dio:
     dependency: transitive
     description:
       name: dio
-      url: "https://pub.dartlang.org"
+      sha256: "2644a9e0965a7aa3deb09cb8ce4081db4450c178f472818c8cd34216a3070d7b"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.0.6"
+    version: "5.0.2"
   extended_image:
     dependency: transitive
     description:
       name: extended_image
-      url: "https://pub.dartlang.org"
+      sha256: "75e4b0ad0f8f63eed7935ff2506c809a670f5e6dd0f61304525879d53fc41a17"
+      url: "https://pub.dev"
     source: hosted
-    version: "6.2.1"
+    version: "7.0.2"
   extended_image_library:
     dependency: transitive
     description:
       name: extended_image_library
-      url: "https://pub.dartlang.org"
+      sha256: b1de389378589e4dffb3564d782373238f19064037458092c49b3043b2791b2b
+      url: "https://pub.dev"
     source: hosted
-    version: "3.3.0"
+    version: "3.4.1"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      url: "https://pub.dartlang.org"
+      sha256: d97fffd9d86f3dccc7a9059128b468a99320c69007cc9d41a3a1bda07d4e86dc
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
   file:
     dependency: transitive
     description:
       name: file
-      url: "https://pub.dartlang.org"
+      sha256: "9fd2163d866769f60f4df8ac1dc59f52498d810c356fe78022e383dd3c57c0e1"
+      url: "https://pub.dev"
     source: hosted
     version: "6.1.0"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      url: "https://pub.dartlang.org"
+      sha256: "6a2ef17156f4dc49684f9d99aaf4a93aba8ac49f5eac861755f5730ddf6e2e4e"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
   flusmic:
     dependency: transitive
     description:
       name: flusmic
-      url: "https://pub.dartlang.org"
+      sha256: d5334f860c5f563b54981831d74204b6a3f5a7d1a684522fa517cae0f27d0211
+      url: "https://pub.dev"
     source: hosted
-    version: "3.2.3"
+    version: "4.0.0"
   flusmic_ui:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "3.2.0"
+    version: "4.0.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -253,252 +286,288 @@ packages:
     dependency: "direct dev"
     description:
       name: freezed
-      url: "https://pub.dartlang.org"
+      sha256: e819441678f1679b719008ff2ff0ef045d66eed9f9ec81166ca0d9b02a187454
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.3+1"
+    version: "2.3.2"
   freezed_annotation:
     dependency: "direct main"
     description:
       name: freezed_annotation
-      url: "https://pub.dartlang.org"
+      sha256: aeac15850ef1b38ee368d4c53ba9a847e900bb2c53a4db3f6881cbb3cb684338
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.3"
+    version: "2.2.0"
   frontend_server_client:
     dependency: transitive
     description:
       name: frontend_server_client
-      url: "https://pub.dartlang.org"
+      sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "3.2.0"
   glob:
     dependency: transitive
     description:
       name: glob
-      url: "https://pub.dartlang.org"
+      sha256: "36a6ea2cac1f93742ecee02250fb498122c0993eb948120ff0dbef6cd694beb8"
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
   graphs:
     dependency: transitive
     description:
       name: graphs
-      url: "https://pub.dartlang.org"
+      sha256: e07b56af3885387b0cbf6502d4ec17149189559de61256b97e195539afd1da0c
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
   http:
     dependency: transitive
     description:
       name: http
-      url: "https://pub.dartlang.org"
+      sha256: "0a48a4e44ec1b6a52eb93b12d129f5b74ee6dbb27703439c965f1bd86f7be59f"
+      url: "https://pub.dev"
     source: hosted
     version: "0.13.0"
   http_client_helper:
     dependency: transitive
     description:
       name: http_client_helper
-      url: "https://pub.dartlang.org"
+      sha256: f707a6a0d0a22683ad32861c2acc14ce11547ad09eb016d7e7b6cfeb9f348e23
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.2"
   http_multi_server:
     dependency: transitive
     description:
       name: http_multi_server
-      url: "https://pub.dartlang.org"
+      sha256: bfb651625e251a88804ad6d596af01ea903544757906addcb2dcdf088b5ea185
+      url: "https://pub.dev"
     source: hosted
     version: "3.0.1"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      url: "https://pub.dartlang.org"
+      sha256: e362d639ba3bc07d5a71faebb98cde68c05bfbcfbbb444b60b6f60bb67719185
+      url: "https://pub.dev"
     source: hosted
     version: "4.0.0"
   intl:
     dependency: transitive
     description:
       name: intl
-      url: "https://pub.dartlang.org"
+      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
+      url: "https://pub.dev"
     source: hosted
     version: "0.17.0"
   io:
     dependency: transitive
     description:
       name: io
-      url: "https://pub.dartlang.org"
+      sha256: "15a5436d2a02dc60e6dc2fb5d7dfaac08b7b137cff3d4bf3158d38ecab656b69"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
   js:
     dependency: transitive
     description:
       name: js
-      url: "https://pub.dartlang.org"
+      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.6.3"
+    version: "0.6.5"
   json_annotation:
     dependency: "direct main"
     description:
       name: json_annotation
-      url: "https://pub.dartlang.org"
+      sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317
+      url: "https://pub.dev"
     source: hosted
-    version: "4.5.0"
+    version: "4.8.0"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
-      url: "https://pub.dartlang.org"
+      sha256: dadc08bd61f72559f938dd08ec20dbfec6c709bba83515085ea943d2078d187a
+      url: "https://pub.dev"
     source: hosted
-    version: "6.2.0"
+    version: "6.6.1"
   logging:
     dependency: transitive
     description:
       name: logging
-      url: "https://pub.dartlang.org"
+      sha256: "3730d4c02b0c2d1db80ef9904e27fa796d75474f572a70011e0e616ee6bfc0ff"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.11"
+    version: "0.12.13"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      url: "https://pub.dartlang.org"
+      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      url: "https://pub.dev"
     source: hosted
-    version: "0.1.4"
+    version: "0.2.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      url: "https://pub.dartlang.org"
+      sha256: a7a98ea7f366e2cc9d2b20873815aebec5e2bc124fe0da9d3f7f59b0625ea180
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
   package_config:
     dependency: transitive
     description:
       name: package_config
-      url: "https://pub.dartlang.org"
+      sha256: "20e7154d701fedaeb219dad732815ecb66677667871127998a9a6581c2aba4ba"
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   path_provider:
     dependency: transitive
     description:
       name: path_provider
-      url: "https://pub.dartlang.org"
+      sha256: aa1b3572707c240d72569ce01756728cf0c8dca0cc381253d8ca2858c13edfe4
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      url: "https://pub.dartlang.org"
+      sha256: "938d2b6591587bcb009d2109a6ea464fd8fb2a75dc6423171b0d0afb1d27c708"
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
   path_provider_macos:
     dependency: transitive
     description:
       name: path_provider_macos
-      url: "https://pub.dartlang.org"
+      sha256: eb58b896ea3a504f0b0fa7870646bda6935a6f752b2a54df33f97070dacca8d4
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: c2af5a8a6369992d915f8933dfc23172071001359d17896e83db8be57db8a397
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.1"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      url: "https://pub.dartlang.org"
+      sha256: ecd4d04c225596bcf0fbb86408a1f40084a02dfa412e60172ad52a7f12a781ef
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
   pedantic:
     dependency: transitive
     description:
       name: pedantic
-      url: "https://pub.dartlang.org"
+      sha256: "8f6460c77a98ad2807cd3b98c67096db4286f56166852d0ce5951bb600a63594"
+      url: "https://pub.dev"
     source: hosted
     version: "1.11.0"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      url: "https://pub.dartlang.org"
+      sha256: f725a68581f744b9cdc680e525a20fb86491053bf5ee23562e0d6ea3ee1c173c
+      url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
   platform:
     dependency: transitive
     description:
       name: platform
-      url: "https://pub.dartlang.org"
+      sha256: ebc79f16b5f6b609aad4a5e63447d4795d16f7adee46e93ed03200848c006735
+      url: "https://pub.dev"
     source: hosted
     version: "3.0.0"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: c2c49e16d42fd6983eb55e44b7f197fdf16b4da7aab7f8e1d21da307cad3fb02
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
   pool:
     dependency: transitive
     description:
       name: pool
-      url: "https://pub.dartlang.org"
+      sha256: "05955e3de2683e1746222efd14b775df7131139e07695dc8e24650f6b4204504"
+      url: "https://pub.dev"
     source: hosted
     version: "1.5.0"
   process:
     dependency: transitive
     description:
       name: process
-      url: "https://pub.dartlang.org"
+      sha256: c7b9f7d8a6ee4407ab4f8a7d4a951f8f5659c40df14c0924e2e97c32372e9b14
+      url: "https://pub.dev"
     source: hosted
     version: "4.1.0"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      url: "https://pub.dartlang.org"
+      sha256: "59ed538734419e81f7fc18c98249ae72c3c7188bdd9dceff2840585227f79843"
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      url: "https://pub.dartlang.org"
+      sha256: "358c5ce09744e0e08b3f5f38c53d7d26a8219dd641718f8500f49cfa56240358"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
   shelf:
     dependency: transitive
     description:
       name: shelf
-      url: "https://pub.dartlang.org"
+      sha256: c0710a5ca61f1a96e9aae37081040f537c1b96265040edeb70c8817a10d361c6
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
-      url: "https://pub.dartlang.org"
+      sha256: "520368a1a49798425310ca0ee28eb92b3c737e4e9d173c31b6c66fe090ebc6fc"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
   sky_engine:
@@ -510,142 +579,162 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      url: "https://pub.dartlang.org"
+      sha256: c2bea18c95cfa0276a366270afaa2850b09b4a76db95d546f3d003dcc7011298
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
+    version: "1.2.7"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
-      url: "https://pub.dartlang.org"
+      sha256: "3b67aade1d52416149c633ba1bb36df44d97c6b51830c2198e934e3fca87ca1f"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.3.3"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.2"
+    version: "1.9.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   state_notifier:
     dependency: transitive
     description:
       name: state_notifier
-      url: "https://pub.dartlang.org"
+      sha256: "8fe42610f179b843b12371e40db58c9444f8757f8b69d181c97e50787caed289"
+      url: "https://pub.dev"
     source: hosted
     version: "0.7.2+1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   stream_transform:
     dependency: transitive
     description:
       name: stream_transform
-      url: "https://pub.dartlang.org"
+      sha256: ed464977cb26a1f41537e177e190c67223dbd9f4f683489b6ab2e5d211ec564e
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      url: "https://pub.dev"
     source: hosted
-    version: "0.4.9"
+    version: "0.4.16"
   timing:
     dependency: transitive
     description:
       name: timing
-      url: "https://pub.dartlang.org"
+      sha256: c386d07d7f5efc613479a7c4d9d64b03710b03cfaa7e8ad5f2bfb295a1f0dfad
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.dartlang.org"
+      sha256: "53bdf7e979cfbf3e28987552fd72f637e63f3c8724c9e56d9246942dc2fa36ee"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      url: "https://pub.dartlang.org"
+      sha256: "68173f2fa67d241323a4123be7ed4e43424c54befa5505d71c8ad4b7baf8f71d"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      url: "https://pub.dartlang.org"
+      sha256: "0c2ada1b1aeb2ad031ca81872add6be049b8cb479262c6ad3c4b0f9c24eaab2f"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
   webfeed:
     dependency: transitive
     description:
       name: webfeed
-      url: "https://pub.dartlang.org"
+      sha256: f30cbf8cc6c72ab0419acd2c686be5bc69b6abdbaaad21d90f150853297eb8c5
+      url: "https://pub.dev"
     source: hosted
     version: "0.7.0"
   win32:
     dependency: transitive
     description:
       name: win32
-      url: "https://pub.dartlang.org"
+      sha256: c6a3f4e4058b70b46e27b2935de2d1562c50680e7fb44833911d981db73826c2
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.0"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      url: "https://pub.dartlang.org"
+      sha256: "0186b3f2d66be9a12b0295bddcf8b6f8c0b0cc2f85c6287344e2a6366bc28457"
+      url: "https://pub.dev"
     source: hosted
     version: "0.2.0"
   xml:
     dependency: transitive
     description:
       name: xml
-      url: "https://pub.dartlang.org"
+      sha256: d212eabbd5066ceba6b5187a2ae89a86c609fbba160876b493f2f5db684f0190
+      url: "https://pub.dev"
     source: hosted
     version: "5.0.2"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      url: "https://pub.dartlang.org"
+      sha256: "3cee79b1715110341012d27756d9bae38e650588acd38d3f3c610822e1337ace"
+      url: "https://pub.dev"
     source: hosted
     version: "3.1.0"
 sdks:
-  dart: ">=2.17.0 <3.0.0"
-  flutter: ">=3.0.0"
+  dart: ">=2.19.0 <3.0.0"
+  flutter: ">=3.7.0"
diff --git a/packages/flusmic_ui/lib/flusmic_ui.dart b/packages/flusmic_ui/lib/flusmic_ui.dart
index 15bd245..64d2850 100644
--- a/packages/flusmic_ui/lib/flusmic_ui.dart
+++ b/packages/flusmic_ui/lib/flusmic_ui.dart
@@ -1,3 +1,4 @@
+///Flusmic UI library
 library flusmic_ui;
 
 export 'package:flusmic/flusmic.dart';
diff --git a/packages/flusmic_ui/lib/src/flusmic_builder.dart b/packages/flusmic_ui/lib/src/flusmic_builder.dart
index 2ea58aa..d1ed1f0 100644
--- a/packages/flusmic_ui/lib/src/flusmic_builder.dart
+++ b/packages/flusmic_ui/lib/src/flusmic_builder.dart
@@ -33,10 +33,10 @@ class FlusmicController extends StateNotifier<FlusmicControllerState> {
 class FlusmicBuilder extends StatefulWidget {
   ///Main constructor
   const FlusmicBuilder({
-    Key? key,
     required this.baseUrl,
     required this.builder,
     required this.predicates,
+    Key? key,
     this.orderings,
     this.authToken,
     this.controller,
@@ -96,13 +96,14 @@ class _FlusmicBuilderState extends State<FlusmicBuilder> {
     super.dispose();
   }
 
-  Future<FlusmicResponse> _perform() async => (widget.flusmic ??
-          Flusmic(
-            defaultAuthToken: widget.authToken,
-            defaultLanguage: widget.language,
-            prismicEndpoint: widget.baseUrl,
-          ))
-      .query(widget.predicates, orderings: widget.orderings);
+  Future<FlusmicResponse<Document<Map<String, dynamic>>>> _perform() async =>
+      (widget.flusmic ??
+              Flusmic(
+                defaultAuthToken: widget.authToken,
+                defaultLanguage: widget.language,
+                prismicEndpoint: widget.baseUrl,
+              ))
+          .query(widget.predicates, orderings: widget.orderings);
 
   void onRepeat() => _requestBloc.perform(_perform, 'FlusmicRequest');
 
@@ -112,8 +113,9 @@ class _FlusmicBuilderState extends State<FlusmicBuilder> {
       context,
       _currentState.when(
         error: (error) => FlusmicStatus.error(error),
-        loaded: (dynamic result, _, __) =>
-            FlusmicStatus.loaded(result as FlusmicResponse),
+        loaded: (dynamic result, _, __) => FlusmicStatus.loaded(
+          result as FlusmicResponse<Document<Map<String, dynamic>>>,
+        ),
         loading: () => FlusmicStatus.loading(),
         uninitialized: () => FlusmicStatus.init(),
       ),
diff --git a/packages/flusmic_ui/lib/src/models/flusmic_status.dart b/packages/flusmic_ui/lib/src/models/flusmic_status.dart
index 01b49db..05a1a8b 100644
--- a/packages/flusmic_ui/lib/src/models/flusmic_status.dart
+++ b/packages/flusmic_ui/lib/src/models/flusmic_status.dart
@@ -16,5 +16,7 @@ class FlusmicStatus with _$FlusmicStatus {
   factory FlusmicStatus.error(String error) = ErrorFlusmicStatus;
 
   ///Loaded state
-  factory FlusmicStatus.loaded(FlusmicResponse response) = LoadedFlusmicStatus;
+  factory FlusmicStatus.loaded(
+    FlusmicResponse<Document<Map<String, dynamic>>> response,
+  ) = LoadedFlusmicStatus;
 }
diff --git a/packages/flusmic_ui/lib/src/models/flusmic_status.freezed.dart b/packages/flusmic_ui/lib/src/models/flusmic_status.freezed.dart
index 30444a8..ea183a6 100644
--- a/packages/flusmic_ui/lib/src/models/flusmic_status.freezed.dart
+++ b/packages/flusmic_ui/lib/src/models/flusmic_status.freezed.dart
@@ -1,7 +1,7 @@
 // coverage:ignore-file
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
 part of 'flusmic_status.dart';
 
@@ -21,15 +21,15 @@ mixin _$FlusmicStatus {
     required TResult Function() init,
     required TResult Function() loading,
     required TResult Function(String error) error,
-    required TResult Function(FlusmicResponse response) loaded,
+    required TResult Function(FlusmicResponse<dynamic> response) loaded,
   }) =>
       throw _privateConstructorUsedError;
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult Function()? init,
-    TResult Function()? loading,
-    TResult Function(String error)? error,
-    TResult Function(FlusmicResponse response)? loaded,
+    TResult? Function()? init,
+    TResult? Function()? loading,
+    TResult? Function(String error)? error,
+    TResult? Function(FlusmicResponse<dynamic> response)? loaded,
   }) =>
       throw _privateConstructorUsedError;
   @optionalTypeArgs
@@ -37,7 +37,7 @@ mixin _$FlusmicStatus {
     TResult Function()? init,
     TResult Function()? loading,
     TResult Function(String error)? error,
-    TResult Function(FlusmicResponse response)? loaded,
+    TResult Function(FlusmicResponse<dynamic> response)? loaded,
     required TResult orElse(),
   }) =>
       throw _privateConstructorUsedError;
@@ -51,10 +51,10 @@ mixin _$FlusmicStatus {
       throw _privateConstructorUsedError;
   @optionalTypeArgs
   TResult? mapOrNull<TResult extends Object?>({
-    TResult Function(InitFlusmicStatus value)? init,
-    TResult Function(LoadingFlusmicStatus value)? loading,
-    TResult Function(ErrorFlusmicStatus value)? error,
-    TResult Function(LoadedFlusmicStatus value)? loaded,
+    TResult? Function(InitFlusmicStatus value)? init,
+    TResult? Function(LoadingFlusmicStatus value)? loading,
+    TResult? Function(ErrorFlusmicStatus value)? error,
+    TResult? Function(LoadedFlusmicStatus value)? loaded,
   }) =>
       throw _privateConstructorUsedError;
   @optionalTypeArgs
@@ -72,17 +72,18 @@ mixin _$FlusmicStatus {
 abstract class $FlusmicStatusCopyWith<$Res> {
   factory $FlusmicStatusCopyWith(
           FlusmicStatus value, $Res Function(FlusmicStatus) then) =
-      _$FlusmicStatusCopyWithImpl<$Res>;
+      _$FlusmicStatusCopyWithImpl<$Res, FlusmicStatus>;
 }
 
 /// @nodoc
-class _$FlusmicStatusCopyWithImpl<$Res>
+class _$FlusmicStatusCopyWithImpl<$Res, $Val extends FlusmicStatus>
     implements $FlusmicStatusCopyWith<$Res> {
   _$FlusmicStatusCopyWithImpl(this._value, this._then);
 
-  final FlusmicStatus _value;
   // ignore: unused_field
-  final $Res Function(FlusmicStatus) _then;
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
 }
 
 /// @nodoc
@@ -94,14 +95,11 @@ abstract class _$$InitFlusmicStatusCopyWith<$Res> {
 
 /// @nodoc
 class __$$InitFlusmicStatusCopyWithImpl<$Res>
-    extends _$FlusmicStatusCopyWithImpl<$Res>
+    extends _$FlusmicStatusCopyWithImpl<$Res, _$InitFlusmicStatus>
     implements _$$InitFlusmicStatusCopyWith<$Res> {
   __$$InitFlusmicStatusCopyWithImpl(
       _$InitFlusmicStatus _value, $Res Function(_$InitFlusmicStatus) _then)
-      : super(_value, (v) => _then(v as _$InitFlusmicStatus));
-
-  @override
-  _$InitFlusmicStatus get _value => super._value as _$InitFlusmicStatus;
+      : super(_value, _then);
 }
 
 /// @nodoc
@@ -129,7 +127,7 @@ class _$InitFlusmicStatus implements InitFlusmicStatus {
     required TResult Function() init,
     required TResult Function() loading,
     required TResult Function(String error) error,
-    required TResult Function(FlusmicResponse response) loaded,
+    required TResult Function(FlusmicResponse<dynamic> response) loaded,
   }) {
     return init();
   }
@@ -137,10 +135,10 @@ class _$InitFlusmicStatus implements InitFlusmicStatus {
   @override
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult Function()? init,
-    TResult Function()? loading,
-    TResult Function(String error)? error,
-    TResult Function(FlusmicResponse response)? loaded,
+    TResult? Function()? init,
+    TResult? Function()? loading,
+    TResult? Function(String error)? error,
+    TResult? Function(FlusmicResponse<dynamic> response)? loaded,
   }) {
     return init?.call();
   }
@@ -151,7 +149,7 @@ class _$InitFlusmicStatus implements InitFlusmicStatus {
     TResult Function()? init,
     TResult Function()? loading,
     TResult Function(String error)? error,
-    TResult Function(FlusmicResponse response)? loaded,
+    TResult Function(FlusmicResponse<dynamic> response)? loaded,
     required TResult orElse(),
   }) {
     if (init != null) {
@@ -174,10 +172,10 @@ class _$InitFlusmicStatus implements InitFlusmicStatus {
   @override
   @optionalTypeArgs
   TResult? mapOrNull<TResult extends Object?>({
-    TResult Function(InitFlusmicStatus value)? init,
-    TResult Function(LoadingFlusmicStatus value)? loading,
-    TResult Function(ErrorFlusmicStatus value)? error,
-    TResult Function(LoadedFlusmicStatus value)? loaded,
+    TResult? Function(InitFlusmicStatus value)? init,
+    TResult? Function(LoadingFlusmicStatus value)? loading,
+    TResult? Function(ErrorFlusmicStatus value)? error,
+    TResult? Function(LoadedFlusmicStatus value)? loaded,
   }) {
     return init?.call(this);
   }
@@ -211,14 +209,11 @@ abstract class _$$LoadingFlusmicStatusCopyWith<$Res> {
 
 /// @nodoc
 class __$$LoadingFlusmicStatusCopyWithImpl<$Res>
-    extends _$FlusmicStatusCopyWithImpl<$Res>
+    extends _$FlusmicStatusCopyWithImpl<$Res, _$LoadingFlusmicStatus>
     implements _$$LoadingFlusmicStatusCopyWith<$Res> {
   __$$LoadingFlusmicStatusCopyWithImpl(_$LoadingFlusmicStatus _value,
       $Res Function(_$LoadingFlusmicStatus) _then)
-      : super(_value, (v) => _then(v as _$LoadingFlusmicStatus));
-
-  @override
-  _$LoadingFlusmicStatus get _value => super._value as _$LoadingFlusmicStatus;
+      : super(_value, _then);
 }
 
 /// @nodoc
@@ -246,7 +241,7 @@ class _$LoadingFlusmicStatus implements LoadingFlusmicStatus {
     required TResult Function() init,
     required TResult Function() loading,
     required TResult Function(String error) error,
-    required TResult Function(FlusmicResponse response) loaded,
+    required TResult Function(FlusmicResponse<dynamic> response) loaded,
   }) {
     return loading();
   }
@@ -254,10 +249,10 @@ class _$LoadingFlusmicStatus implements LoadingFlusmicStatus {
   @override
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult Function()? init,
-    TResult Function()? loading,
-    TResult Function(String error)? error,
-    TResult Function(FlusmicResponse response)? loaded,
+    TResult? Function()? init,
+    TResult? Function()? loading,
+    TResult? Function(String error)? error,
+    TResult? Function(FlusmicResponse<dynamic> response)? loaded,
   }) {
     return loading?.call();
   }
@@ -268,7 +263,7 @@ class _$LoadingFlusmicStatus implements LoadingFlusmicStatus {
     TResult Function()? init,
     TResult Function()? loading,
     TResult Function(String error)? error,
-    TResult Function(FlusmicResponse response)? loaded,
+    TResult Function(FlusmicResponse<dynamic> response)? loaded,
     required TResult orElse(),
   }) {
     if (loading != null) {
@@ -291,10 +286,10 @@ class _$LoadingFlusmicStatus implements LoadingFlusmicStatus {
   @override
   @optionalTypeArgs
   TResult? mapOrNull<TResult extends Object?>({
-    TResult Function(InitFlusmicStatus value)? init,
-    TResult Function(LoadingFlusmicStatus value)? loading,
-    TResult Function(ErrorFlusmicStatus value)? error,
-    TResult Function(LoadedFlusmicStatus value)? loaded,
+    TResult? Function(InitFlusmicStatus value)? init,
+    TResult? Function(LoadingFlusmicStatus value)? loading,
+    TResult? Function(ErrorFlusmicStatus value)? error,
+    TResult? Function(LoadedFlusmicStatus value)? loaded,
   }) {
     return loading?.call(this);
   }
@@ -324,26 +319,25 @@ abstract class _$$ErrorFlusmicStatusCopyWith<$Res> {
   factory _$$ErrorFlusmicStatusCopyWith(_$ErrorFlusmicStatus value,
           $Res Function(_$ErrorFlusmicStatus) then) =
       __$$ErrorFlusmicStatusCopyWithImpl<$Res>;
+  @useResult
   $Res call({String error});
 }
 
 /// @nodoc
 class __$$ErrorFlusmicStatusCopyWithImpl<$Res>
-    extends _$FlusmicStatusCopyWithImpl<$Res>
+    extends _$FlusmicStatusCopyWithImpl<$Res, _$ErrorFlusmicStatus>
     implements _$$ErrorFlusmicStatusCopyWith<$Res> {
   __$$ErrorFlusmicStatusCopyWithImpl(
       _$ErrorFlusmicStatus _value, $Res Function(_$ErrorFlusmicStatus) _then)
-      : super(_value, (v) => _then(v as _$ErrorFlusmicStatus));
-
-  @override
-  _$ErrorFlusmicStatus get _value => super._value as _$ErrorFlusmicStatus;
+      : super(_value, _then);
 
+  @pragma('vm:prefer-inline')
   @override
   $Res call({
-    Object? error = freezed,
+    Object? error = null,
   }) {
     return _then(_$ErrorFlusmicStatus(
-      error == freezed
+      null == error
           ? _value.error
           : error // ignore: cast_nullable_to_non_nullable
               as String,
@@ -369,15 +363,15 @@ class _$ErrorFlusmicStatus implements ErrorFlusmicStatus {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$ErrorFlusmicStatus &&
-            const DeepCollectionEquality().equals(other.error, error));
+            (identical(other.error, error) || other.error == error));
   }
 
   @override
-  int get hashCode =>
-      Object.hash(runtimeType, const DeepCollectionEquality().hash(error));
+  int get hashCode => Object.hash(runtimeType, error);
 
   @JsonKey(ignore: true)
   @override
+  @pragma('vm:prefer-inline')
   _$$ErrorFlusmicStatusCopyWith<_$ErrorFlusmicStatus> get copyWith =>
       __$$ErrorFlusmicStatusCopyWithImpl<_$ErrorFlusmicStatus>(
           this, _$identity);
@@ -388,7 +382,7 @@ class _$ErrorFlusmicStatus implements ErrorFlusmicStatus {
     required TResult Function() init,
     required TResult Function() loading,
     required TResult Function(String error) error,
-    required TResult Function(FlusmicResponse response) loaded,
+    required TResult Function(FlusmicResponse<dynamic> response) loaded,
   }) {
     return error(this.error);
   }
@@ -396,10 +390,10 @@ class _$ErrorFlusmicStatus implements ErrorFlusmicStatus {
   @override
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult Function()? init,
-    TResult Function()? loading,
-    TResult Function(String error)? error,
-    TResult Function(FlusmicResponse response)? loaded,
+    TResult? Function()? init,
+    TResult? Function()? loading,
+    TResult? Function(String error)? error,
+    TResult? Function(FlusmicResponse<dynamic> response)? loaded,
   }) {
     return error?.call(this.error);
   }
@@ -410,7 +404,7 @@ class _$ErrorFlusmicStatus implements ErrorFlusmicStatus {
     TResult Function()? init,
     TResult Function()? loading,
     TResult Function(String error)? error,
-    TResult Function(FlusmicResponse response)? loaded,
+    TResult Function(FlusmicResponse<dynamic> response)? loaded,
     required TResult orElse(),
   }) {
     if (error != null) {
@@ -433,10 +427,10 @@ class _$ErrorFlusmicStatus implements ErrorFlusmicStatus {
   @override
   @optionalTypeArgs
   TResult? mapOrNull<TResult extends Object?>({
-    TResult Function(InitFlusmicStatus value)? init,
-    TResult Function(LoadingFlusmicStatus value)? loading,
-    TResult Function(ErrorFlusmicStatus value)? error,
-    TResult Function(LoadedFlusmicStatus value)? loaded,
+    TResult? Function(InitFlusmicStatus value)? init,
+    TResult? Function(LoadingFlusmicStatus value)? loading,
+    TResult? Function(ErrorFlusmicStatus value)? error,
+    TResult? Function(LoadedFlusmicStatus value)? loaded,
   }) {
     return error?.call(this);
   }
@@ -460,7 +454,7 @@ class _$ErrorFlusmicStatus implements ErrorFlusmicStatus {
 abstract class ErrorFlusmicStatus implements FlusmicStatus {
   factory ErrorFlusmicStatus(final String error) = _$ErrorFlusmicStatus;
 
-  String get error => throw _privateConstructorUsedError;
+  String get error;
   @JsonKey(ignore: true)
   _$$ErrorFlusmicStatusCopyWith<_$ErrorFlusmicStatus> get copyWith =>
       throw _privateConstructorUsedError;
@@ -471,37 +465,37 @@ abstract class _$$LoadedFlusmicStatusCopyWith<$Res> {
   factory _$$LoadedFlusmicStatusCopyWith(_$LoadedFlusmicStatus value,
           $Res Function(_$LoadedFlusmicStatus) then) =
       __$$LoadedFlusmicStatusCopyWithImpl<$Res>;
-  $Res call({FlusmicResponse response});
+  @useResult
+  $Res call({FlusmicResponse<dynamic> response});
 
-  $FlusmicResponseCopyWith<$Res> get response;
+  $FlusmicResponseCopyWith<dynamic, $Res> get response;
 }
 
 /// @nodoc
 class __$$LoadedFlusmicStatusCopyWithImpl<$Res>
-    extends _$FlusmicStatusCopyWithImpl<$Res>
+    extends _$FlusmicStatusCopyWithImpl<$Res, _$LoadedFlusmicStatus>
     implements _$$LoadedFlusmicStatusCopyWith<$Res> {
   __$$LoadedFlusmicStatusCopyWithImpl(
       _$LoadedFlusmicStatus _value, $Res Function(_$LoadedFlusmicStatus) _then)
-      : super(_value, (v) => _then(v as _$LoadedFlusmicStatus));
-
-  @override
-  _$LoadedFlusmicStatus get _value => super._value as _$LoadedFlusmicStatus;
+      : super(_value, _then);
 
+  @pragma('vm:prefer-inline')
   @override
   $Res call({
-    Object? response = freezed,
+    Object? response = null,
   }) {
     return _then(_$LoadedFlusmicStatus(
-      response == freezed
+      null == response
           ? _value.response
           : response // ignore: cast_nullable_to_non_nullable
-              as FlusmicResponse,
+              as FlusmicResponse<dynamic>,
     ));
   }
 
   @override
-  $FlusmicResponseCopyWith<$Res> get response {
-    return $FlusmicResponseCopyWith<$Res>(_value.response, (value) {
+  @pragma('vm:prefer-inline')
+  $FlusmicResponseCopyWith<dynamic, $Res> get response {
+    return $FlusmicResponseCopyWith<dynamic, $Res>(_value.response, (value) {
       return _then(_value.copyWith(response: value));
     });
   }
@@ -513,7 +507,7 @@ class _$LoadedFlusmicStatus implements LoadedFlusmicStatus {
   _$LoadedFlusmicStatus(this.response);
 
   @override
-  final FlusmicResponse response;
+  final FlusmicResponse<dynamic> response;
 
   @override
   String toString() {
@@ -525,15 +519,16 @@ class _$LoadedFlusmicStatus implements LoadedFlusmicStatus {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
             other is _$LoadedFlusmicStatus &&
-            const DeepCollectionEquality().equals(other.response, response));
+            (identical(other.response, response) ||
+                other.response == response));
   }
 
   @override
-  int get hashCode =>
-      Object.hash(runtimeType, const DeepCollectionEquality().hash(response));
+  int get hashCode => Object.hash(runtimeType, response);
 
   @JsonKey(ignore: true)
   @override
+  @pragma('vm:prefer-inline')
   _$$LoadedFlusmicStatusCopyWith<_$LoadedFlusmicStatus> get copyWith =>
       __$$LoadedFlusmicStatusCopyWithImpl<_$LoadedFlusmicStatus>(
           this, _$identity);
@@ -544,7 +539,7 @@ class _$LoadedFlusmicStatus implements LoadedFlusmicStatus {
     required TResult Function() init,
     required TResult Function() loading,
     required TResult Function(String error) error,
-    required TResult Function(FlusmicResponse response) loaded,
+    required TResult Function(FlusmicResponse<dynamic> response) loaded,
   }) {
     return loaded(response);
   }
@@ -552,10 +547,10 @@ class _$LoadedFlusmicStatus implements LoadedFlusmicStatus {
   @override
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult Function()? init,
-    TResult Function()? loading,
-    TResult Function(String error)? error,
-    TResult Function(FlusmicResponse response)? loaded,
+    TResult? Function()? init,
+    TResult? Function()? loading,
+    TResult? Function(String error)? error,
+    TResult? Function(FlusmicResponse<dynamic> response)? loaded,
   }) {
     return loaded?.call(response);
   }
@@ -566,7 +561,7 @@ class _$LoadedFlusmicStatus implements LoadedFlusmicStatus {
     TResult Function()? init,
     TResult Function()? loading,
     TResult Function(String error)? error,
-    TResult Function(FlusmicResponse response)? loaded,
+    TResult Function(FlusmicResponse<dynamic> response)? loaded,
     required TResult orElse(),
   }) {
     if (loaded != null) {
@@ -589,10 +584,10 @@ class _$LoadedFlusmicStatus implements LoadedFlusmicStatus {
   @override
   @optionalTypeArgs
   TResult? mapOrNull<TResult extends Object?>({
-    TResult Function(InitFlusmicStatus value)? init,
-    TResult Function(LoadingFlusmicStatus value)? loading,
-    TResult Function(ErrorFlusmicStatus value)? error,
-    TResult Function(LoadedFlusmicStatus value)? loaded,
+    TResult? Function(InitFlusmicStatus value)? init,
+    TResult? Function(LoadingFlusmicStatus value)? loading,
+    TResult? Function(ErrorFlusmicStatus value)? error,
+    TResult? Function(LoadedFlusmicStatus value)? loaded,
   }) {
     return loaded?.call(this);
   }
@@ -614,10 +609,10 @@ class _$LoadedFlusmicStatus implements LoadedFlusmicStatus {
 }
 
 abstract class LoadedFlusmicStatus implements FlusmicStatus {
-  factory LoadedFlusmicStatus(final FlusmicResponse response) =
+  factory LoadedFlusmicStatus(final FlusmicResponse<dynamic> response) =
       _$LoadedFlusmicStatus;
 
-  FlusmicResponse get response => throw _privateConstructorUsedError;
+  FlusmicResponse<dynamic> get response;
   @JsonKey(ignore: true)
   _$$LoadedFlusmicStatusCopyWith<_$LoadedFlusmicStatus> get copyWith =>
       throw _privateConstructorUsedError;
diff --git a/packages/flusmic_ui/lib/src/widgets/rich_text.dart b/packages/flusmic_ui/lib/src/widgets/rich_text.dart
index 613964d..0ec51fe 100644
--- a/packages/flusmic_ui/lib/src/widgets/rich_text.dart
+++ b/packages/flusmic_ui/lib/src/widgets/rich_text.dart
@@ -104,19 +104,20 @@ class _InnerRichTextState extends State<InnerRichText> {
 
   TextStyle? get _styleByType {
     if (widget.text is RichableHeading1) {
-      return widget.headline1Style ?? Theme.of(context).textTheme.headline1;
+      return widget.headline1Style ?? Theme.of(context).textTheme.displaySmall;
     } else if (widget.text is RichableHeading2) {
-      return widget.headline2Style ?? Theme.of(context).textTheme.headline2;
+      return widget.headline2Style ?? Theme.of(context).textTheme.headlineLarge;
     } else if (widget.text is RichableHeading3) {
-      return widget.headline3Style ?? Theme.of(context).textTheme.headline3;
+      return widget.headline3Style ??
+          Theme.of(context).textTheme.headlineMedium;
     } else if (widget.text is RichableHeading4) {
-      return widget.headline4Style ?? Theme.of(context).textTheme.headline4;
+      return widget.headline4Style ?? Theme.of(context).textTheme.headlineSmall;
     } else if (widget.text is RichableHeading5) {
-      return widget.headline5Style ?? Theme.of(context).textTheme.headline5;
+      return widget.headline5Style ?? Theme.of(context).textTheme.titleLarge;
     } else if (widget.text is RichableHeading6) {
-      return widget.headline6Style ?? Theme.of(context).textTheme.headline6;
+      return widget.headline6Style ?? Theme.of(context).textTheme.titleMedium;
     } else {
-      return widget.paragraphStyle ?? Theme.of(context).textTheme.bodyText2;
+      return widget.paragraphStyle ?? Theme.of(context).textTheme.titleSmall;
     }
   }
 }
diff --git a/packages/flusmic_ui/pubspec.lock b/packages/flusmic_ui/pubspec.lock
index a42b3a8..281f8d0 100644
--- a/packages/flusmic_ui/pubspec.lock
+++ b/packages/flusmic_ui/pubspec.lock
@@ -5,240 +5,266 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      url: "https://pub.dartlang.org"
+      sha256: "98d1d33ed129b372846e862de23a0fc365745f4d7b5e786ce667fcbbb7ac5c07"
+      url: "https://pub.dev"
     source: hosted
-    version: "40.0.0"
+    version: "55.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      url: "https://pub.dartlang.org"
+      sha256: "881348aed9b0b425882c97732629a6a31093c8ff20fc4b3b03fb9d3d50a3a126"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "5.7.1"
   args:
     dependency: transitive
     description:
       name: args
-      url: "https://pub.dartlang.org"
+      sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.4.0"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
+      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      url: "https://pub.dev"
     source: hosted
-    version: "2.8.2"
+    version: "2.10.0"
   bloc:
     dependency: transitive
     description:
       name: bloc
-      url: "https://pub.dartlang.org"
+      sha256: "658a5ae59edcf1e58aac98b000a71c762ad8f46f1394c34a52050cafb3e11a80"
+      url: "https://pub.dev"
     source: hosted
-    version: "8.0.3"
+    version: "8.1.1"
   bloc_concurrency:
     dependency: transitive
     description:
       name: bloc_concurrency
-      url: "https://pub.dartlang.org"
+      sha256: "9a94e05be7754ec9cfc6e7a68b340be63381a54cadabee25ec3296838646ad3e"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.2.1"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.dartlang.org"
+      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   build:
     dependency: transitive
     description:
       name: build
-      url: "https://pub.dartlang.org"
+      sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.3.1"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      url: "https://pub.dartlang.org"
+      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.1.1"
   build_daemon:
     dependency: transitive
     description:
       name: build_daemon
-      url: "https://pub.dartlang.org"
+      sha256: "757153e5d9cd88253cb13f28c2fb55a537dc31fefd98137549895b5beb7c6169"
+      url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.1"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
-      url: "https://pub.dartlang.org"
+      sha256: db49b8609ef8c81cca2b310618c3017c00f03a92af44c04d310b907b2d692d95
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.9"
+    version: "2.2.0"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      url: "https://pub.dartlang.org"
+      sha256: b0a8a7b8a76c493e85f1b84bffa0588859a06197863dba8c9036b15581fd9727
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.11"
+    version: "2.3.3"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      url: "https://pub.dartlang.org"
+      sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292"
+      url: "https://pub.dev"
     source: hosted
-    version: "7.2.3"
+    version: "7.2.7"
   built_collection:
     dependency: transitive
     description:
       name: built_collection
-      url: "https://pub.dartlang.org"
+      sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100"
+      url: "https://pub.dev"
     source: hosted
     version: "5.1.1"
   built_value:
     dependency: transitive
     description:
       name: built_value
-      url: "https://pub.dartlang.org"
+      sha256: "31b7c748fd4b9adf8d25d72a4c4a59ef119f12876cf414f94f8af5131d5fa2b0"
+      url: "https://pub.dev"
     source: hosted
-    version: "8.3.2"
+    version: "8.4.4"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
+      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.1"
+    version: "1.2.1"
   checked_yaml:
     dependency: transitive
     description:
       name: checked_yaml
-      url: "https://pub.dartlang.org"
+      sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.dartlang.org"
+      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   code_builder:
     dependency: transitive
     description:
       name: code_builder
-      url: "https://pub.dartlang.org"
+      sha256: "0d43dd1288fd145de1ecc9a3948ad4a6d5a82f0a14c4fdd0892260787d975cbe"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.1.0"
+    version: "4.4.0"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.dartlang.org"
+      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.17.0"
   common_bloc:
     dependency: "direct main"
     description:
       name: common_bloc
-      url: "https://pub.dartlang.org"
+      sha256: "5b26e5f34c7c4ad13557b68cd7305da8d6ea9e65fc4183560bfb6ba0c36f8441"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.2.2"
+    version: "4.2.4"
   convert:
     dependency: transitive
     description:
       name: convert
-      url: "https://pub.dartlang.org"
+      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.1.1"
   coverage:
     dependency: transitive
     description:
       name: coverage
-      url: "https://pub.dartlang.org"
+      sha256: "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.6.3"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      url: "https://pub.dartlang.org"
+      sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67
+      url: "https://pub.dev"
     source: hosted
     version: "3.0.2"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      url: "https://pub.dartlang.org"
+      sha256: "5be16bf1707658e4c03078d4a9b90208ded217fb02c163e207d334082412f2fb"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.2.3"
+    version: "2.2.5"
   dio:
     dependency: transitive
     description:
       name: dio
-      url: "https://pub.dartlang.org"
+      sha256: "2644a9e0965a7aa3deb09cb8ce4081db4450c178f472818c8cd34216a3070d7b"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.0.6"
+    version: "5.0.2"
   extended_image:
     dependency: "direct main"
     description:
       name: extended_image
-      url: "https://pub.dartlang.org"
+      sha256: "75e4b0ad0f8f63eed7935ff2506c809a670f5e6dd0f61304525879d53fc41a17"
+      url: "https://pub.dev"
     source: hosted
-    version: "6.2.1"
+    version: "7.0.2"
   extended_image_library:
     dependency: transitive
     description:
       name: extended_image_library
-      url: "https://pub.dartlang.org"
+      sha256: b1de389378589e4dffb3564d782373238f19064037458092c49b3043b2791b2b
+      url: "https://pub.dev"
     source: hosted
-    version: "3.3.0"
+    version: "3.4.1"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.dartlang.org"
+      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      url: "https://pub.dartlang.org"
+      sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.1"
   file:
     dependency: transitive
     description:
       name: file
-      url: "https://pub.dartlang.org"
+      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
+      url: "https://pub.dev"
     source: hosted
-    version: "6.1.2"
+    version: "6.1.4"
   fixnum:
     dependency: transitive
     description:
       name: fixnum
-      url: "https://pub.dartlang.org"
+      sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0"
   flusmic:
     dependency: "direct main"
     description:
       name: flusmic
-      url: "https://pub.dartlang.org"
+      sha256: d5334f860c5f563b54981831d74204b6a3f5a7d1a684522fa517cae0f27d0211
+      url: "https://pub.dev"
     source: hosted
-    version: "3.2.3"
+    version: "4.0.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -253,282 +279,314 @@ packages:
     dependency: "direct dev"
     description:
       name: freezed
-      url: "https://pub.dartlang.org"
+      sha256: e819441678f1679b719008ff2ff0ef045d66eed9f9ec81166ca0d9b02a187454
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.3+1"
+    version: "2.3.2"
   freezed_annotation:
     dependency: "direct main"
     description:
       name: freezed_annotation
-      url: "https://pub.dartlang.org"
+      sha256: aeac15850ef1b38ee368d4c53ba9a847e900bb2c53a4db3f6881cbb3cb684338
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.3"
+    version: "2.2.0"
   frontend_server_client:
     dependency: transitive
     description:
       name: frontend_server_client
-      url: "https://pub.dartlang.org"
+      sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "3.2.0"
   glob:
     dependency: transitive
     description:
       name: glob
-      url: "https://pub.dartlang.org"
+      sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.1"
   graphs:
     dependency: transitive
     description:
       name: graphs
-      url: "https://pub.dartlang.org"
+      sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.2.0"
   http:
     dependency: transitive
     description:
       name: http
-      url: "https://pub.dartlang.org"
+      sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.13.4"
+    version: "0.13.5"
   http_client_helper:
     dependency: transitive
     description:
       name: http_client_helper
-      url: "https://pub.dartlang.org"
+      sha256: "1f32359bd07a064ad256d1f84ae5f973f69bc972e7287223fa198abe1d969c28"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
   http_multi_server:
     dependency: transitive
     description:
       name: http_multi_server
-      url: "https://pub.dartlang.org"
+      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
+      url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "3.2.1"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      url: "https://pub.dartlang.org"
+      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
   intl:
     dependency: transitive
     description:
       name: intl
-      url: "https://pub.dartlang.org"
+      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
+      url: "https://pub.dev"
     source: hosted
     version: "0.17.0"
   io:
     dependency: transitive
     description:
       name: io
-      url: "https://pub.dartlang.org"
+      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.3"
+    version: "1.0.4"
   js:
     dependency: transitive
     description:
       name: js
-      url: "https://pub.dartlang.org"
+      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.6.4"
+    version: "0.6.5"
   json_annotation:
     dependency: transitive
     description:
       name: json_annotation
-      url: "https://pub.dartlang.org"
+      sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317
+      url: "https://pub.dev"
     source: hosted
-    version: "4.5.0"
+    version: "4.8.0"
   logging:
     dependency: transitive
     description:
       name: logging
-      url: "https://pub.dartlang.org"
+      sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.1.1"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.dartlang.org"
+      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.12.11"
+    version: "0.12.13"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      url: "https://pub.dartlang.org"
+      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      url: "https://pub.dev"
     source: hosted
-    version: "0.1.4"
+    version: "0.2.0"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      url: "https://pub.dartlang.org"
+      sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.4"
   mocktail:
     dependency: "direct dev"
     description:
       name: mocktail
-      url: "https://pub.dartlang.org"
+      sha256: "80a996cd9a69284b3dc521ce185ffe9150cde69767c2d3a0720147d93c0cef53"
+      url: "https://pub.dev"
     source: hosted
     version: "0.3.0"
   node_preamble:
     dependency: transitive
     description:
       name: node_preamble
-      url: "https://pub.dartlang.org"
+      sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   package_config:
     dependency: transitive
     description:
       name: package_config
-      url: "https://pub.dartlang.org"
+      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.0"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   path_provider:
     dependency: transitive
     description:
       name: path_provider
-      url: "https://pub.dartlang.org"
+      sha256: "04890b994ee89bfa80bf3080bfec40d5a92c5c7a785ebb02c13084a099d2b6f9"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.11"
+    version: "2.0.13"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      url: "https://pub.dartlang.org"
+      sha256: "019f18c9c10ae370b08dce1f3e3b73bc9f58e7f087bb5e921f06529438ac0ae7"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.14"
-  path_provider_ios:
+    version: "2.0.24"
+  path_provider_foundation:
     dependency: transitive
     description:
-      name: path_provider_ios
-      url: "https://pub.dartlang.org"
+      name: path_provider_foundation
+      sha256: "026b97a6c29da75181a37aae2eba9227f5fe13cb2838c6b975ce209328b8ab4e"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.9"
+    version: "2.1.3"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.7"
-  path_provider_macos:
-    dependency: transitive
-    description:
-      name: path_provider_macos
-      url: "https://pub.dartlang.org"
+      sha256: "2ae08f2216225427e64ad224a24354221c2c7907e448e6e0e8b57b1eb9f10ad1"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.6"
+    version: "2.1.10"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.4"
+    version: "2.0.6"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      url: "https://pub.dartlang.org"
+      sha256: f53720498d5a543f9607db4b0e997c4b5438884de25b0f73098cc2671a51b130
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.5"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      url: "https://pub.dartlang.org"
+      sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4"
+      url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "5.1.0"
   platform:
     dependency: transitive
     description:
       name: platform
-      url: "https://pub.dartlang.org"
+      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
+      url: "https://pub.dev"
     source: hosted
     version: "3.1.0"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      url: "https://pub.dartlang.org"
+      sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   pool:
     dependency: transitive
     description:
       name: pool
-      url: "https://pub.dartlang.org"
+      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
+    version: "1.5.1"
   process:
     dependency: transitive
     description:
       name: process
-      url: "https://pub.dartlang.org"
+      sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
+      url: "https://pub.dev"
     source: hosted
     version: "4.2.4"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      url: "https://pub.dartlang.org"
+      sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.3"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      url: "https://pub.dartlang.org"
+      sha256: ec85d7d55339d85f44ec2b682a82fea340071e8978257e5a43e69f79e98ef50c
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.2"
   shelf:
     dependency: transitive
     description:
       name: shelf
-      url: "https://pub.dartlang.org"
+      sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c
+      url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   shelf_packages_handler:
     dependency: transitive
     description:
       name: shelf_packages_handler
-      url: "https://pub.dartlang.org"
+      sha256: aef74dc9195746a384843102142ab65b6a4735bb3beea791e63527b88cc83306
+      url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "3.0.1"
   shelf_static:
     dependency: transitive
     description:
       name: shelf_static
-      url: "https://pub.dartlang.org"
+      sha256: e792b76b96a36d4a41b819da593aff4bdd413576b3ba6150df5d8d9996d2e74c
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   shelf_web_socket:
     dependency: transitive
     description:
       name: shelf_web_socket
-      url: "https://pub.dartlang.org"
+      sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -538,184 +596,210 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      url: "https://pub.dartlang.org"
+      sha256: c2bea18c95cfa0276a366270afaa2850b09b4a76db95d546f3d003dcc7011298
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
+    version: "1.2.7"
   source_map_stack_trace:
     dependency: transitive
     description:
       name: source_map_stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   source_maps:
     dependency: transitive
     description:
       name: source_maps
-      url: "https://pub.dartlang.org"
+      sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.10.10"
+    version: "0.10.12"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
+      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      url: "https://pub.dev"
     source: hosted
-    version: "1.8.2"
+    version: "1.9.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.dartlang.org"
+      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.11.0"
   state_notifier:
     dependency: "direct main"
     description:
       name: state_notifier
-      url: "https://pub.dartlang.org"
+      sha256: "8fe42610f179b843b12371e40db58c9444f8757f8b69d181c97e50787caed289"
+      url: "https://pub.dev"
     source: hosted
     version: "0.7.2+1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.dartlang.org"
+      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
   stream_transform:
     dependency: transitive
     description:
       name: stream_transform
-      url: "https://pub.dartlang.org"
+      sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test:
     dependency: transitive
     description:
       name: test
-      url: "https://pub.dartlang.org"
+      sha256: a5fcd2d25eeadbb6589e80198a47d6a464ba3e2049da473943b8af9797900c2d
+      url: "https://pub.dev"
     source: hosted
-    version: "1.21.1"
+    version: "1.22.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.dartlang.org"
+      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      url: "https://pub.dev"
     source: hosted
-    version: "0.4.9"
+    version: "0.4.16"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      url: "https://pub.dartlang.org"
+      sha256: "0ef9755ec6d746951ba0aabe62f874b707690b5ede0fecc818b138fcc9b14888"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.4.13"
+    version: "0.4.20"
   timing:
     dependency: transitive
     description:
       name: timing
-      url: "https://pub.dartlang.org"
+      sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.1"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.dartlang.org"
+      sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+      url: "https://pub.dev"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.4"
   very_good_analysis:
     dependency: "direct dev"
     description:
       name: very_good_analysis
-      url: "https://pub.dartlang.org"
+      sha256: ebc48c51db35beeeec8c414e32f7bd78e612bd7f5992ccb0d46e19edaeb40b08
+      url: "https://pub.dev"
     source: hosted
-    version: "3.0.0"
+    version: "4.0.0+1"
   vm_service:
     dependency: transitive
     description:
       name: vm_service
-      url: "https://pub.dartlang.org"
+      sha256: e7fb6c2282f7631712b69c19d1bff82f3767eea33a2321c14fa59ad67ea391c7
+      url: "https://pub.dev"
     source: hosted
-    version: "8.3.0"
+    version: "9.4.0"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      url: "https://pub.dartlang.org"
+      sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      url: "https://pub.dartlang.org"
+      sha256: ca49c0bc209c687b887f30527fb6a9d80040b072cc2990f34b9bec3e7663101b
+      url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   webfeed:
     dependency: transitive
     description:
       name: webfeed
-      url: "https://pub.dartlang.org"
+      sha256: f30cbf8cc6c72ab0419acd2c686be5bc69b6abdbaaad21d90f150853297eb8c5
+      url: "https://pub.dev"
     source: hosted
     version: "0.7.0"
   webkit_inspection_protocol:
     dependency: transitive
     description:
       name: webkit_inspection_protocol
-      url: "https://pub.dartlang.org"
+      sha256: "67d3a8b6c79e1987d19d848b0892e582dbb0c66c57cc1fef58a177dd2aa2823d"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   win32:
     dependency: transitive
     description:
       name: win32
-      url: "https://pub.dartlang.org"
+      sha256: c9ebe7ee4ab0c2194e65d3a07d8c54c5d00bb001b76081c4a04cdb8448b59e46
+      url: "https://pub.dev"
     source: hosted
-    version: "2.7.0"
+    version: "3.1.3"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      url: "https://pub.dartlang.org"
+      sha256: ee1505df1426458f7f60aac270645098d318a8b4766d85fde75f76f2e21807d1
+      url: "https://pub.dev"
     source: hosted
-    version: "0.2.0+1"
+    version: "1.0.0"
   xml:
     dependency: transitive
     description:
       name: xml
-      url: "https://pub.dartlang.org"
+      sha256: "80d494c09849dc3f899d227a78c30c5b949b985ededf884cb3f3bcd39f4b447a"
+      url: "https://pub.dev"
     source: hosted
     version: "5.4.1"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      url: "https://pub.dartlang.org"
+      sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370"
+      url: "https://pub.dev"
     source: hosted
     version: "3.1.1"
 sdks:
-  dart: ">=2.17.0 <3.0.0"
-  flutter: ">=3.0.0"
+  dart: ">=2.19.0 <3.0.0"
+  flutter: ">=3.7.0"
diff --git a/packages/flusmic_ui/pubspec.yaml b/packages/flusmic_ui/pubspec.yaml
index d0c2bad..a7d85df 100644
--- a/packages/flusmic_ui/pubspec.yaml
+++ b/packages/flusmic_ui/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flusmic_ui
 description: A collection of widgets, utilities and extensions to integrate Flusmic more easy in Flutter.
-version: 3.2.0
+version: 4.0.0
 repository: https://github.com/PixelaGt/flusmic
 issue_tracker: https://github.com/PixelaGt/flusmic/issues
 homepage: https://github.com/PixelaGt/flusmic
@@ -9,21 +9,21 @@ environment:
   sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
-  common_bloc: ^4.2.2
-  extended_image: ^6.2.1
-  flusmic: ^3.2.3
+  common_bloc: ^4.2.4
+  extended_image: ^7.0.2
+  flusmic: ^4.0.0
   flutter:
     sdk: flutter
-  freezed_annotation: ^2.0.3
+  freezed_annotation: ^2.2.0
   state_notifier: ^0.7.2+1
 
 dev_dependencies:
-  build_runner: ^2.1.11
+  build_runner: ^2.3.3
   flutter_test:
     sdk: flutter
-  freezed: ^2.0.3+1
+  freezed: ^2.3.2
   mocktail: ^0.3.0
-  very_good_analysis: ^3.0.0
+  very_good_analysis: ^4.0.0+1
 
 flutter:
   #
diff --git a/packages/flusmic_ui/test/flusmic_builder_test.dart b/packages/flusmic_ui/test/flusmic_builder_test.dart
index 674f172..a701fc8 100644
--- a/packages/flusmic_ui/test/flusmic_builder_test.dart
+++ b/packages/flusmic_ui/test/flusmic_builder_test.dart
@@ -17,7 +17,13 @@ void main() {
         when(() => flusmic.query(predicates)).thenAnswer(
           (invocation) => Future.delayed(
             const Duration(seconds: 30),
-            () => FlusmicResponse.fromJson(mockResponse),
+            () => FlusmicResponse.fromJson(
+              mockResponse,
+              (resultJson) => Document.fromJson(
+                resultJson! as Map<String, dynamic>,
+                (documentJson) => documentJson! as Map<String, dynamic>,
+              ),
+            ),
           ),
         );
 
@@ -42,7 +48,13 @@ void main() {
 
       when(() => flusmic.query(predicates)).thenAnswer(
         (invocation) => Future.value(
-          FlusmicResponse.fromJson(mockResponse),
+          FlusmicResponse.fromJson(
+            mockResponse,
+            (resultJson) => Document.fromJson(
+              resultJson! as Map<String, dynamic>,
+              (documentJson) => documentJson! as Map<String, dynamic>,
+            ),
+          ),
         ),
       );
 
@@ -63,7 +75,13 @@ void main() {
 
       when(() => flusmic.query(predicates)).thenAnswer(
         (invocation) => Future.value(
-          FlusmicResponse.fromJson(mockResponse),
+          FlusmicResponse.fromJson(
+            mockResponse,
+            (resultJson) => Document.fromJson(
+              resultJson! as Map<String, dynamic>,
+              (documentJson) => documentJson! as Map<String, dynamic>,
+            ),
+          ),
         ),
       );
 
diff --git a/packages/flusmic_ui/test/flusmic_rich_text_test.dart b/packages/flusmic_ui/test/flusmic_rich_text_test.dart
index c26d272..119d3c5 100644
--- a/packages/flusmic_ui/test/flusmic_rich_text_test.dart
+++ b/packages/flusmic_ui/test/flusmic_rich_text_test.dart
@@ -15,7 +15,13 @@ void main() {
         ];
         when(() => flusmic.query(predicates)).thenAnswer(
           (invocation) => Future.value(
-            FlusmicResponse.fromJson(mockResponse),
+            FlusmicResponse.fromJson(
+              mockResponse,
+              (resultJson) => Document.fromJson(
+                resultJson! as Map<String, dynamic>,
+                (documentJson) => documentJson! as Map<String, dynamic>,
+              ),
+            ),
           ),
         );
         await tester
@@ -31,8 +37,11 @@ void main() {
 }
 
 class FlusmicApp extends StatefulWidget {
-  const FlusmicApp({Key? key, required this.flusmic, required this.predicates})
-      : super(key: key);
+  const FlusmicApp({
+    required this.flusmic,
+    required this.predicates,
+    Key? key,
+  }) : super(key: key);
 
   final Flusmic flusmic;
   final List<Predicate> predicates;
@@ -55,7 +64,11 @@ class _FlusmicAppState extends State<FlusmicApp> {
             loading: (s) => const Text('Loading', key: Key('loading')),
             error: (s) => const Text('Error', key: Key('error')),
             loaded: (s) {
-              final data = s.response.results.first.data;
+              final data = (s.response
+                      as FlusmicResponse<Document<Map<String, dynamic>>>)
+                  .results
+                  .first
+                  .data;
 
               final richFields = data != null
                   ? (data['content'] as List)