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 27c85492..2bf69058 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
@@ -128,8 +128,8 @@ class BookQuery extends Query<Book, BookQueryWhere> {
   }
 
   @override
-  Book deserialize(List row) {
-    return parseRow(row).value;
+  Optional<Book> deserialize(List row) {
+    return parseRow(row);
   }
 
   AuthorQuery? get author {
@@ -269,8 +269,8 @@ class AuthorQuery extends Query<Author, AuthorQueryWhere> {
   }
 
   @override
-  Author deserialize(List row) {
-    return parseRow(row).value;
+  Optional<Author> deserialize(List row) {
+    return parseRow(row);
   }
 }
 
diff --git a/packages/orm/angel_orm_test/lib/src/models/car.g.dart b/packages/orm/angel_orm_test/lib/src/models/car.g.dart
index dbc92598..4e9900e5 100644
--- a/packages/orm/angel_orm_test/lib/src/models/car.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/car.g.dart
@@ -91,8 +91,8 @@ class CarQuery extends Query<Car, CarQueryWhere> {
   }
 
   @override
-  Car deserialize(List row) {
-    return parseRow(row).value;
+  Optional<Car> deserialize(List row) {
+    return parseRow(row);
   }
 }
 
diff --git a/packages/orm/angel_orm_test/lib/src/models/custom_expr.g.dart b/packages/orm/angel_orm_test/lib/src/models/custom_expr.g.dart
index d1667384..a3807a19 100644
--- a/packages/orm/angel_orm_test/lib/src/models/custom_expr.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/custom_expr.g.dart
@@ -98,8 +98,8 @@ class NumbersQuery extends Query<Numbers, NumbersQueryWhere> {
   }
 
   @override
-  Numbers deserialize(List row) {
-    return parseRow(row).value;
+  Optional<Numbers> deserialize(List row) {
+    return parseRow(row);
   }
 }
 
@@ -209,8 +209,8 @@ class AlphabetQuery extends Query<Alphabet, AlphabetQueryWhere> {
   }
 
   @override
-  Alphabet deserialize(List row) {
-    return parseRow(row).value;
+  Optional<Alphabet> deserialize(List row) {
+    return parseRow(row);
   }
 
   NumbersQuery? get numbers {
diff --git a/packages/orm/angel_orm_test/lib/src/models/email_indexed.g.dart b/packages/orm/angel_orm_test/lib/src/models/email_indexed.g.dart
index 8b349367..f8ecb1b3 100644
--- a/packages/orm/angel_orm_test/lib/src/models/email_indexed.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/email_indexed.g.dart
@@ -117,8 +117,8 @@ class RoleQuery extends Query<Role, RoleQueryWhere> {
   }
 
   @override
-  Role deserialize(List row) {
-    return parseRow(row).value;
+  Optional<Role> deserialize(List row) {
+    return parseRow(row);
   }
 
   @override
@@ -281,8 +281,8 @@ class RoleUserQuery extends Query<RoleUser, RoleUserQueryWhere> {
   }
 
   @override
-  RoleUser deserialize(List row) {
-    return parseRow(row).value;
+  Optional<RoleUser> deserialize(List row) {
+    return parseRow(row);
   }
 
   RoleQuery? get role {
@@ -398,8 +398,8 @@ class UserQuery extends Query<User, UserQueryWhere> {
   }
 
   @override
-  User deserialize(List row) {
-    return parseRow(row).value;
+  Optional<User> deserialize(List row) {
+    return parseRow(row);
   }
 
   @override
diff --git a/packages/orm/angel_orm_test/lib/src/models/has_car.g.dart b/packages/orm/angel_orm_test/lib/src/models/has_car.g.dart
index e29c4bb5..09a7192e 100644
--- a/packages/orm/angel_orm_test/lib/src/models/has_car.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/has_car.g.dart
@@ -78,8 +78,8 @@ class HasCarQuery extends Query<HasCar, HasCarQueryWhere> {
   }
 
   @override
-  HasCar deserialize(List row) {
-    return parseRow(row).value;
+  Optional<HasCar> deserialize(List row) {
+    return parseRow(row);
   }
 }
 
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 f6746de3..23183e8b 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
@@ -74,8 +74,8 @@ class HasMapQuery extends Query<HasMap, HasMapQueryWhere> {
   }
 
   @override
-  HasMap deserialize(List row) {
-    return parseRow(row).value;
+  Optional<HasMap> deserialize(List row) {
+    return parseRow(row);
   }
 }
 
diff --git a/packages/orm/angel_orm_test/lib/src/models/leg.g.dart b/packages/orm/angel_orm_test/lib/src/models/leg.g.dart
index 633313ae..129d46d6 100644
--- a/packages/orm/angel_orm_test/lib/src/models/leg.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/leg.g.dart
@@ -111,8 +111,8 @@ class LegQuery extends Query<Leg, LegQueryWhere> {
   }
 
   @override
-  Leg deserialize(List row) {
-    return parseRow(row).value;
+  Optional<Leg> deserialize(List row) {
+    return parseRow(row);
   }
 
   FootQuery? get foot {
@@ -225,8 +225,8 @@ class FootQuery extends Query<Foot, FootQueryWhere> {
   }
 
   @override
-  Foot deserialize(List row) {
-    return parseRow(row).value;
+  Optional<Foot> deserialize(List row) {
+    return parseRow(row);
   }
 }
 
diff --git a/packages/orm/angel_orm_test/lib/src/models/order.g.dart b/packages/orm/angel_orm_test/lib/src/models/order.g.dart
index ed161c22..774f53b6 100644
--- a/packages/orm/angel_orm_test/lib/src/models/order.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/order.g.dart
@@ -118,8 +118,8 @@ class OrderQuery extends Query<Order, OrderQueryWhere> {
   }
 
   @override
-  Order deserialize(List row) {
-    return parseRow(row).value;
+  Optional<Order> deserialize(List row) {
+    return parseRow(row);
   }
 
   CustomerQuery? get customer {
@@ -268,8 +268,8 @@ class CustomerQuery extends Query<Customer, CustomerQueryWhere> {
   }
 
   @override
-  Customer deserialize(List row) {
-    return parseRow(row).value;
+  Optional<Customer> deserialize(List row) {
+    return parseRow(row);
   }
 }
 
diff --git a/packages/orm/angel_orm_test/lib/src/models/tree.g.dart b/packages/orm/angel_orm_test/lib/src/models/tree.g.dart
index 5783bd6c..b2086ea8 100644
--- a/packages/orm/angel_orm_test/lib/src/models/tree.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/tree.g.dart
@@ -111,8 +111,8 @@ class TreeQuery extends Query<Tree, TreeQueryWhere> {
   }
 
   @override
-  Tree deserialize(List row) {
-    return parseRow(row).value;
+  Optional<Tree> deserialize(List row) {
+    return parseRow(row);
   }
 
   FruitQuery? get fruits {
@@ -282,8 +282,8 @@ class FruitQuery extends Query<Fruit, FruitQueryWhere> {
   }
 
   @override
-  Fruit deserialize(List row) {
-    return parseRow(row).value;
+  Optional<Fruit> deserialize(List row) {
+    return parseRow(row);
   }
 }
 
diff --git a/packages/orm/angel_orm_test/lib/src/models/unorthodox.g.dart b/packages/orm/angel_orm_test/lib/src/models/unorthodox.g.dart
index f8149809..f9e33405 100644
--- a/packages/orm/angel_orm_test/lib/src/models/unorthodox.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/unorthodox.g.dart
@@ -152,8 +152,8 @@ class UnorthodoxQuery extends Query<Unorthodox, UnorthodoxQueryWhere> {
   }
 
   @override
-  Unorthodox deserialize(List row) {
-    return parseRow(row).value;
+  Optional<Unorthodox> deserialize(List row) {
+    return parseRow(row);
   }
 }
 
@@ -280,8 +280,8 @@ class WeirdJoinQuery extends Query<WeirdJoin, WeirdJoinQueryWhere> {
   }
 
   @override
-  WeirdJoin deserialize(List row) {
-    return parseRow(row).value;
+  Optional<WeirdJoin> deserialize(List row) {
+    return parseRow(row);
   }
 
   UnorthodoxQuery? get unorthodox {
@@ -453,8 +453,8 @@ class SongQuery extends Query<Song, SongQueryWhere> {
   }
 
   @override
-  Song deserialize(List row) {
-    return parseRow(row).value;
+  Optional<Song> deserialize(List row) {
+    return parseRow(row);
   }
 }
 
@@ -567,8 +567,8 @@ class NumbaQuery extends Query<Numba, NumbaQueryWhere> {
   }
 
   @override
-  Numba deserialize(List row) {
-    return parseRow(row).value;
+  Optional<Numba> deserialize(List row) {
+    return parseRow(row);
   }
 }
 
@@ -666,8 +666,8 @@ class FooQuery extends Query<Foo, FooQueryWhere> {
   }
 
   @override
-  Foo deserialize(List row) {
-    return parseRow(row).value;
+  Optional<Foo> deserialize(List row) {
+    return parseRow(row);
   }
 
   @override
@@ -828,8 +828,8 @@ class FooPivotQuery extends Query<FooPivot, FooPivotQueryWhere> {
   }
 
   @override
-  FooPivot deserialize(List row) {
-    return parseRow(row).value;
+  Optional<FooPivot> deserialize(List row) {
+    return parseRow(row);
   }
 
   WeirdJoinQuery? get weirdJoin {
diff --git a/packages/orm/angel_orm_test/lib/src/models/user.g.dart b/packages/orm/angel_orm_test/lib/src/models/user.g.dart
index 62e8ff9f..cd4d26d8 100644
--- a/packages/orm/angel_orm_test/lib/src/models/user.g.dart
+++ b/packages/orm/angel_orm_test/lib/src/models/user.g.dart
@@ -130,8 +130,8 @@ class UserQuery extends Query<User, UserQueryWhere> {
   }
 
   @override
-  User deserialize(List row) {
-    return parseRow(row).value;
+  Optional<User> deserialize(List row) {
+    return parseRow(row);
   }
 
   @override
@@ -341,8 +341,8 @@ class RoleUserQuery extends Query<RoleUser, RoleUserQueryWhere> {
   }
 
   @override
-  RoleUser deserialize(List row) {
-    return parseRow(row).value;
+  Optional<RoleUser> deserialize(List row) {
+    return parseRow(row);
   }
 
   RoleQuery? get role {
@@ -464,8 +464,8 @@ class RoleQuery extends Query<Role, RoleQueryWhere> {
   }
 
   @override
-  Role deserialize(List row) {
-    return parseRow(row).value;
+  Optional<Role> deserialize(List row) {
+    return parseRow(row);
   }
 
   @override