diff --git a/pkgs/messages_builder/lib/builder.dart b/pkgs/messages_builder/lib/builder.dart
index 9f763224..9e368914 100644
--- a/pkgs/messages_builder/lib/builder.dart
+++ b/pkgs/messages_builder/lib/builder.dart
@@ -77,15 +77,12 @@ class MessageCallingCodeGenerator {
     final resourcesInContext = assetList
         .where((resource) => resource.message.context == messageList.context);
 
-    final localeToResourceInfo =
-        Map.fromEntries(resourcesInContext.map((resource) => MapEntry(
-              resource.message.locale ?? 'en_US',
-              (
-                id: 'package:${options.packageName}/${resource.path}',
-                hasch: resource.message.hash,
-              ),
-            ))
-          ..sortedBy((element) => element.key));
+    final localeToResourceInfo = resourcesInContext.map((resource) => (
+          locale: resource.message.locale ?? 'en_US',
+          id: 'package:${options.packageName}/${resource.path}',
+          hasch: resource.message.hash,
+        ))
+      ..sortedBy((entry) => entry.locale);
 
     printIncludeFilesNotification(messageList.context, localeToResourceInfo);
     return LibraryGeneration(
@@ -148,14 +145,13 @@ class MessageCallingCodeGenerator {
   /// in their assets.
   void printIncludeFilesNotification(
     String? context,
-    Map<String, ({String hasch, String id})> localeToResource,
+    Iterable<({String hasch, String id, String locale})> localeToResource,
   ) {
     var contextMessage = 'The';
     if (context != null) {
       contextMessage = 'For the messages in $context, the';
     }
-    final fileList =
-        localeToResource.entries.map((e) => '\t${e.value.id}').join('\n');
+    final fileList = localeToResource.map((e) => '\t${e.id}').join('\n');
     print(
         '''$contextMessage following files need to be declared in your assets:\n$fileList''');
   }
diff --git a/pkgs/messages_builder/lib/code_generation/field_generation.dart b/pkgs/messages_builder/lib/code_generation/field_generation.dart
index aaf7d0f0..ed6df0c9 100644
--- a/pkgs/messages_builder/lib/code_generation/field_generation.dart
+++ b/pkgs/messages_builder/lib/code_generation/field_generation.dart
@@ -8,7 +8,8 @@ import '../generation_options.dart';
 
 class FieldGeneration {
   final GenerationOptions options;
-  final Map<String, ({String id, String hasch})> localeToResourceInfo;
+  final Iterable<({String hasch, String id, String locale})>
+      localeToResourceInfo;
   final String locale;
 
   FieldGeneration(
@@ -42,8 +43,8 @@ class FieldGeneration {
     );
     final dataFiles = Field(
       (fb) {
-        final paths = localeToResourceInfo.entries
-            .map((e) => "'${e.key}' : ('${e.value.id}', '${e.value.hasch}')")
+        final paths = localeToResourceInfo
+            .map((e) => "'${e.locale}' : ('${e.id}', '${e.hasch}')")
             .join(',');
         fb
           ..name = '_dataFiles'
diff --git a/pkgs/messages_builder/lib/code_generation/library_generation.dart b/pkgs/messages_builder/lib/code_generation/library_generation.dart
index 32c44d30..10725044 100644
--- a/pkgs/messages_builder/lib/code_generation/library_generation.dart
+++ b/pkgs/messages_builder/lib/code_generation/library_generation.dart
@@ -16,7 +16,8 @@ class LibraryGeneration {
   final String? context;
   final String locale;
   final List<MessageWithMetadata> messages;
-  final Map<String, ({String id, String hasch})> localeToResourceInfo;
+  final Iterable<({String hasch, String id, String locale})>
+      localeToResourceInfo;
 
   LibraryGeneration(
     this.options,