diff --git a/packages/orm/angel_orm_test/analysis_options.yaml b/packages/orm/angel_orm_test/analysis_options.yaml
new file mode 100644
index 00000000..c230cee7
--- /dev/null
+++ b/packages/orm/angel_orm_test/analysis_options.yaml
@@ -0,0 +1,4 @@
+include: package:pedantic/analysis_options.yaml
+analyzer:
+  strong-mode:
+    implicit-casts: false
\ No newline at end of file
diff --git a/packages/orm/angel_orm_test/lib/src/models/book.g.dart b/packages/orm/angel_orm_test/lib/src/models/book.g.dart
index 3fe3606a..83cf7735 100644
--- a/packages/orm/angel_orm_test/lib/src/models/book.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/book.g.dart
@@ -265,9 +265,9 @@ class AuthorQuery extends Query<Author, AuthorQueryWhere> {
     }
     var model = Author(
         id: row[0].toString(),
-        createdAt: (row[1]),
-        updatedAt: (row[2]),
-        name: (row[3]));
+        createdAt: (row[1] as DateTime?),
+        updatedAt: (row[2] as DateTime?),
+        name: (row[3]) as String?);
     return Optional.ofNullable(model);
   }
 
diff --git a/packages/orm/angel_orm_test/lib/src/models/has_map.g.dart b/packages/orm/angel_orm_test/lib/src/models/has_map.g.dart
index cde41fb2..066c85dd 100644
--- a/packages/orm/angel_orm_test/lib/src/models/has_map.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/has_map.g.dart
@@ -67,7 +67,10 @@ class HasMapQuery extends Query<HasMap, HasMapQueryWhere> {
     if (row.every((x) => x == null)) {
       return Optional.empty();
     }
-    var model = HasMap(value: (row[0]), list: (row[1]));
+
+    var m = {};
+    m[row[0]] = row[0];
+    var model = HasMap(value: m, list: [row[1]]);
     return Optional.of(model);
   }
 
@@ -148,7 +151,7 @@ class HasMap implements _HasMap {
 
   @override
   String toString() {
-    return "HasMap(value=$value, list=$list)";
+    return 'HasMap(value=$value, list=$list)';
   }
 
   Map<String, dynamic> toJson() {
diff --git a/packages/orm/angel_orm_test/pubspec.yaml b/packages/orm/angel_orm_test/pubspec.yaml
index 2cf1e113..bc9922ab 100644
--- a/packages/orm/angel_orm_test/pubspec.yaml
+++ b/packages/orm/angel_orm_test/pubspec.yaml
@@ -16,3 +16,4 @@ dev_dependencies:
   angel3_framework: ^4.0.0
   build_runner: ^2.0.1
   optional: ^6.0.0-nullsafety.2
+  pedantic: ^1.11.0