diff --git a/.github/workflows/leancode_cubit_utils_cqrs-publish.yml b/.github/workflows/leancode_cubit_utils_cqrs-publish.yml
index 9b5194a..fd3e0c6 100644
--- a/.github/workflows/leancode_cubit_utils_cqrs-publish.yml
+++ b/.github/workflows/leancode_cubit_utils_cqrs-publish.yml
@@ -25,12 +25,12 @@ jobs:
       - name: Setup Dart
         uses: dart-lang/setup-dart@v1
         with:
-          sdk: 3.2
+          sdk: 3.6
 
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: 3.19.x
+          flutter-version: 3.27.x
           cache: true
 
       - name: Publish and release
diff --git a/.github/workflows/leancode_cubit_utils_cqrs-test.yml b/.github/workflows/leancode_cubit_utils_cqrs-test.yml
index 0a925d1..d48c7cb 100644
--- a/.github/workflows/leancode_cubit_utils_cqrs-test.yml
+++ b/.github/workflows/leancode_cubit_utils_cqrs-test.yml
@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - version: '3.19.x'
+          - version: '3.27.x'
 
     defaults:
       run:
diff --git a/packages/leancode_cubit_utils_cqrs/CHANGELOG.md b/packages/leancode_cubit_utils_cqrs/CHANGELOG.md
index 3740bf0..7498f5e 100644
--- a/packages/leancode_cubit_utils_cqrs/CHANGELOG.md
+++ b/packages/leancode_cubit_utils_cqrs/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.1
+
+* Upgrade `bloc` to ^9.0.0
+
 ## 0.3.0
 
 * Use `leancode_cubit_utils` version `0.3.1`
diff --git a/packages/leancode_cubit_utils_cqrs/example/lib/pages/paginated/paginated_cubit_page.dart b/packages/leancode_cubit_utils_cqrs/example/lib/pages/paginated/paginated_cubit_page.dart
index 63a39b6..f038383 100644
--- a/packages/leancode_cubit_utils_cqrs/example/lib/pages/paginated/paginated_cubit_page.dart
+++ b/packages/leancode_cubit_utils_cqrs/example/lib/pages/paginated/paginated_cubit_page.dart
@@ -77,15 +77,12 @@ class FiltersRow extends StatelessWidget {
           return Wrap(
             spacing: 8,
             children: [
-              ...availableFilters
-                  .map(
-                    (filter) => FilterChip(
-                      label: Text(filter.name),
-                      selected: selectedFilters.contains(filter),
-                      onSelected: (_) => toggleFilter(filter),
-                    ),
-                  )
-                  .toList(),
+              for (final filter in availableFilters)
+                FilterChip(
+                  label: Text(filter.name),
+                  selected: selectedFilters.contains(filter),
+                  onSelected: (_) => toggleFilter(filter),
+                ),
             ],
           );
         }
diff --git a/packages/leancode_cubit_utils_cqrs/example/pubspec.lock b/packages/leancode_cubit_utils_cqrs/example/pubspec.lock
index a2c3bbd..106a7ca 100644
--- a/packages/leancode_cubit_utils_cqrs/example/pubspec.lock
+++ b/packages/leancode_cubit_utils_cqrs/example/pubspec.lock
@@ -1,30 +1,6 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  _fe_analyzer_shared:
-    dependency: transitive
-    description:
-      name: _fe_analyzer_shared
-      sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a
-      url: "https://pub.dev"
-    source: hosted
-    version: "61.0.0"
-  analyzer:
-    dependency: transitive
-    description:
-      name: analyzer
-      sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.13.0"
-  args:
-    dependency: transitive
-    description:
-      name: args
-      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.2"
   async:
     dependency: "direct main"
     description:
@@ -37,10 +13,10 @@ packages:
     dependency: transitive
     description:
       name: bloc
-      sha256: "3820f15f502372d979121de1f6b97bfcf1630ebff8fe1d52fb2b0bfa49be5b49"
+      sha256: "52c10575f4445c61dd9e0cafcc6356fdd827c4c64dd7945ef3c4105f6b6ac189"
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.2"
+    version: "9.0.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -69,26 +45,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  convert:
-    dependency: transitive
-    description:
-      name: convert
-      sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592"
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
-  coverage:
-    dependency: transitive
-    description:
-      name: coverage
-      sha256: "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.7.2"
+    version: "1.19.0"
   cqrs:
     dependency: "direct main"
     description:
@@ -109,10 +69,10 @@ packages:
     dependency: "direct main"
     description:
       name: equatable
-      sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
+      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.5"
+    version: "2.0.7"
   fake_async:
     dependency: transitive
     description:
@@ -125,18 +85,10 @@ packages:
     dependency: "direct main"
     description:
       name: faker
-      sha256: "746e59f91d8b06a389e74cf76e909a05ed69c12691768e2f93557fdf29200fd0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
-  file:
-    dependency: transitive
-    description:
-      name: file
-      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      sha256: "544c34e9e1d322824156d5a8d451bc1bb778263b892aded24ec7ba77b0706624"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "2.2.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -146,47 +98,31 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_bloc
-      sha256: e74efb89ee6945bcbce74a5b3a5a3376b088e5f21f55c263fc38cbdc6237faae
+      sha256: "153856bdaac302bbdc58a1d1403d50c40557254aa05eaeed40515d88a25a526b"
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.3"
+    version: "9.0.0"
   flutter_hooks:
     dependency: transitive
     description:
       name: flutter_hooks
-      sha256: "6ae13b1145c589112cbd5c4fda6c65908993a9cb18d4f82042e9c28dd9fbf611"
+      sha256: cde36b12f7188c85286fba9b38cc5a902e7279f36dd676967106c041dc9dde70
       url: "https://pub.dev"
     source: hosted
-    version: "0.20.1"
+    version: "0.20.5"
   flutter_lints:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04
+      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.3"
+    version: "5.0.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
     source: sdk
     version: "0.0.0"
-  frontend_server_client:
-    dependency: transitive
-    description:
-      name: frontend_server_client
-      sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.2.0"
-  glob:
-    dependency: transitive
-    description:
-      name: glob
-      sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
   http:
     dependency: transitive
     description:
@@ -195,14 +131,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
-  http_multi_server:
-    dependency: transitive
-    description:
-      name: http_multi_server
-      sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.2.1"
   http_parser:
     dependency: transitive
     description:
@@ -211,38 +139,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
-  io:
-    dependency: transitive
-    description:
-      name: io
-      sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.4"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.6.7"
   leak_tracker:
     dependency: transitive
     description:
       name: leak_tracker
-      sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
+      sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.4"
+    version: "10.0.7"
   leak_tracker_flutter_testing:
     dependency: transitive
     description:
       name: leak_tracker_flutter_testing
-      sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
+      sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.8"
   leak_tracker_testing:
     dependency: transitive
     description:
@@ -255,41 +167,41 @@ packages:
     dependency: transitive
     description:
       name: leancode_cubit_utils
-      sha256: a437577a8f0f854c67b5f76d849721d2d0f468a2d9c9801a1646fb23a0559d16
+      sha256: f642d9aad5bce940eb9aae9c4eca830e96d1254e52fd7bf882ab5e98abc81c41
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.0"
+    version: "0.3.2"
   leancode_cubit_utils_cqrs:
     dependency: "direct main"
     description:
       path: ".."
       relative: true
     source: path
-    version: "0.1.0"
+    version: "0.3.0"
   leancode_hooks:
     dependency: "direct main"
     description:
       name: leancode_hooks
-      sha256: ca4d6323ccc1bb62bfd6574beeb0b230e69c4af9008371c0c4ac7229ce9c2831
+      sha256: "79e6d08feb004ac784a71c641a51cb5de71da60d65616ca75d4cbcb4453377bc"
       url: "https://pub.dev"
     source: hosted
-    version: "0.0.6"
+    version: "0.1.1"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
+      sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "5.1.1"
   logging:
     dependency: "direct main"
     description:
       name: logging
-      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   matcher:
     dependency: transitive
     description:
@@ -302,34 +214,26 @@ packages:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.12.0"
-  mime:
-    dependency: transitive
-    description:
-      name: mime
-      sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.4"
+    version: "1.15.0"
   mocktail:
     dependency: "direct main"
     description:
       name: mocktail
-      sha256: "9503969a7c2c78c7292022c70c0289ed6241df7a9ba720010c0b215af29a5a58"
+      sha256: "890df3f9688106f25755f26b1c60589a92b3ab91a22b8b224947ad041bf172d8"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.0"
+    version: "1.0.4"
   nested:
     dependency: transitive
     description:
@@ -338,22 +242,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
-  node_preamble:
-    dependency: transitive
-    description:
-      name: node_preamble
-      sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.2"
-  package_config:
-    dependency: transitive
-    description:
-      name: package_config
-      sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.0"
   path:
     dependency: transitive
     description:
@@ -362,83 +250,19 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.9.0"
-  pool:
-    dependency: transitive
-    description:
-      name: pool
-      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.5.1"
   provider:
     dependency: "direct main"
     description:
       name: provider
-      sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.5"
-  pub_semver:
-    dependency: transitive
-    description:
-      name: pub_semver
-      sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  shelf:
-    dependency: transitive
-    description:
-      name: shelf
-      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.1"
-  shelf_packages_handler:
-    dependency: transitive
-    description:
-      name: shelf_packages_handler
-      sha256: "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.2"
-  shelf_static:
-    dependency: transitive
-    description:
-      name: shelf_static
-      sha256: a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.2"
-  shelf_web_socket:
-    dependency: transitive
-    description:
-      name: shelf_web_socket
-      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
+      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "6.1.2"
   sky_engine:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
-  source_map_stack_trace:
-    dependency: transitive
-    description:
-      name: source_map_stack_trace
-      sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  source_maps:
-    dependency: transitive
-    description:
-      name: source_maps
-      sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.10.12"
+    version: "0.0.0"
   source_span:
     dependency: transitive
     description:
@@ -451,10 +275,10 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
   stream_channel:
     dependency: transitive
     description:
@@ -467,10 +291,10 @@ packages:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   term_glyph:
     dependency: transitive
     description:
@@ -479,30 +303,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
-  test:
-    dependency: transitive
-    description:
-      name: test
-      sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.25.2"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.0"
-  test_core:
-    dependency: transitive
-    description:
-      name: test_core
-      sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.7.3"
   typed_data:
     dependency: transitive
     description:
@@ -523,42 +331,10 @@ packages:
     dependency: transitive
     description:
       name: vm_service
-      sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
-      url: "https://pub.dev"
-    source: hosted
-    version: "14.2.1"
-  watcher:
-    dependency: transitive
-    description:
-      name: watcher
-      sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.0"
-  web_socket_channel:
-    dependency: transitive
-    description:
-      name: web_socket_channel
-      sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.0"
-  webkit_inspection_protocol:
-    dependency: transitive
-    description:
-      name: webkit_inspection_protocol
-      sha256: "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  yaml:
-    dependency: transitive
-    description:
-      name: yaml
-      sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
+      sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.2"
+    version: "14.3.0"
 sdks:
-  dart: ">=3.3.0 <4.0.0"
+  dart: ">=3.6.0 <4.0.0"
   flutter: ">=3.18.0-18.0.pre.54"
diff --git a/packages/leancode_cubit_utils_cqrs/example/pubspec.yaml b/packages/leancode_cubit_utils_cqrs/example/pubspec.yaml
index dfb411c..7b50d7a 100644
--- a/packages/leancode_cubit_utils_cqrs/example/pubspec.yaml
+++ b/packages/leancode_cubit_utils_cqrs/example/pubspec.yaml
@@ -8,23 +8,23 @@ environment:
 
 dependencies:
   cqrs: ^10.0.1
-  equatable: ^2.0.5
-  faker: ^2.1.0
+  equatable: ^2.0.7
+  faker: ^2.2.0
   flutter:
     sdk: flutter
-  flutter_bloc: ^8.1.3
-  mocktail: ^1.0.0
+  flutter_bloc: ^9.0.0
+  mocktail: ^1.0.4
   leancode_cubit_utils_cqrs:
     path: ..
-  provider: ^6.0.5
-  logging: ^1.2.0
-  leancode_hooks: ^0.0.6
+  provider: ^6.1.2
+  logging: ^1.3.0
+  leancode_hooks: ^0.1.1
   async: ^2.11.0
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  flutter_lints: ^2.0.0
+  flutter_lints: ^5.0.0
 
 flutter:
   uses-material-design: true
diff --git a/packages/leancode_cubit_utils_cqrs/lib/leancode_cubit_utils_cqrs.dart b/packages/leancode_cubit_utils_cqrs/lib/leancode_cubit_utils_cqrs.dart
index 3b0a79b..b05f491 100644
--- a/packages/leancode_cubit_utils_cqrs/lib/leancode_cubit_utils_cqrs.dart
+++ b/packages/leancode_cubit_utils_cqrs/lib/leancode_cubit_utils_cqrs.dart
@@ -1,7 +1,8 @@
 /// A library for building cubits for handling CQRS with less boilerplate code.
-library leancode_cubit_utils_cqrs;
+library;
 
 export 'package:leancode_cubit_utils/leancode_cubit_utils.dart';
+
 export 'src/paginated/paginated_query_cubit.dart';
 export 'src/paginated/pre_request/query_pre_request.dart';
 export 'src/request/query_cubit.dart';
diff --git a/packages/leancode_cubit_utils_cqrs/lib/src/request/use_query_cubit.dart b/packages/leancode_cubit_utils_cqrs/lib/src/request/use_query_cubit.dart
index 7e79b7d..cffe728 100644
--- a/packages/leancode_cubit_utils_cqrs/lib/src/request/use_query_cubit.dart
+++ b/packages/leancode_cubit_utils_cqrs/lib/src/request/use_query_cubit.dart
@@ -1,6 +1,7 @@
 import 'package:cqrs/cqrs.dart';
 import 'package:leancode_cubit_utils/leancode_cubit_utils.dart';
 import 'package:leancode_hooks/leancode_hooks.dart';
+
 import 'query_cubit.dart';
 
 /// Simplified implementation of [QueryCubit] created in order to be used by [useQueryCubit].
@@ -44,7 +45,7 @@ SimpleQueryCubit<TOut> useQueryCubit<TOut>(
       }
       return cubit;
     },
-    keys,
+    keys: keys,
   );
 }
 
@@ -99,7 +100,7 @@ SimpleQueryWithEmptyCubit<TOut> useQueryWithEmptyCubit<TOut>(
       }
       return cubit;
     },
-    keys,
+    keys: keys,
   );
 }
 
@@ -137,7 +138,7 @@ SimpleArgsQueryCubit<TArgs, TOut> useArgsQueryCubit<TArgs, TOut>(
       request,
       requestMode: requestMode,
     ),
-    keys,
+    keys: keys,
   );
 }
 
@@ -187,6 +188,6 @@ SimpleArgsQueryWithEmptyCubit<TArgs, TOut>
       isEmpty,
       requestMode: requestMode,
     ),
-    keys,
+    keys: keys,
   );
 }
diff --git a/packages/leancode_cubit_utils_cqrs/pubspec.yaml b/packages/leancode_cubit_utils_cqrs/pubspec.yaml
index 953bb7e..1bf9393 100644
--- a/packages/leancode_cubit_utils_cqrs/pubspec.yaml
+++ b/packages/leancode_cubit_utils_cqrs/pubspec.yaml
@@ -1,6 +1,6 @@
 name: leancode_cubit_utils_cqrs
 description: An extension of leancode_cubit_utils that provides cqrs support.
-version: 0.3.0
+version: 0.3.1
 repository: https://github.com/leancodepl/leancode_cubit_utils
 
 environment:
@@ -8,18 +8,16 @@ environment:
 
 dependencies:
   cqrs: ^10.0.1
-  equatable: ^2.0.0
+  equatable: ^2.0.7
   flutter:
     sdk: flutter
-  flutter_bloc: ^8.0.0
-  leancode_cubit_utils: ^0.3.1
-  leancode_hooks: ^0.0.6
+  flutter_bloc: ^9.0.0
+  leancode_cubit_utils: ^0.3.2
+  leancode_hooks: ^0.1.1
 
 dev_dependencies:
-  bloc_test: ^9.0.0
+  bloc_test: ^10.0.0
   flutter_test:
     sdk: flutter
-  leancode_lint: ^9.0.0
-  mocktail: ^1.0.0
-
-flutter:
+  leancode_lint: ^15.0.0
+  mocktail: ^1.0.4