diff --git a/angel_orm_generator/test/models/author.dart b/angel_orm_generator/test/models/author.dart
index 274685d9..ed045366 100644
--- a/angel_orm_generator/test/models/author.dart
+++ b/angel_orm_generator/test/models/author.dart
@@ -1,13 +1,16 @@
 library angel_orm.generator.models.author;
 
-import 'package:angel_framework/common.dart';
+import 'package:angel_model/angel_model.dart';
 import 'package:angel_orm/angel_orm.dart';
 import 'package:angel_serialize/angel_serialize.dart';
+
 part 'author.g.dart';
 
+part 'author.serializer.g.dart';
+
 @serializable
 @orm
 class _Author extends Model {
-  @Column(length: 255, indexType: IndexType.UNIQUE, defaultValue: 'Tobe Osakwe')
+  @Column(length: 255, indexType: IndexType.unique, defaultValue: 'Tobe Osakwe')
   String name;
 }
diff --git a/angel_orm_generator/test/models/book.dart b/angel_orm_generator/test/models/book.dart
index 7d57997c..fa675b3c 100644
--- a/angel_orm_generator/test/models/book.dart
+++ b/angel_orm_generator/test/models/book.dart
@@ -1,10 +1,11 @@
 library angel_orm.generator.models.book;
 
-import 'package:angel_framework/common.dart';
+import 'package:angel_model/angel_model.dart';
 import 'package:angel_orm/angel_orm.dart';
 import 'package:angel_serialize/angel_serialize.dart';
 import 'author.dart';
 part 'book.g.dart';
+part 'book.serializer.g.dart';
 
 @serializable
 @orm
diff --git a/angel_orm_generator/test/models/car.dart b/angel_orm_generator/test/models/car.dart
index 7c6739d2..3cf1a7b8 100644
--- a/angel_orm_generator/test/models/car.dart
+++ b/angel_orm_generator/test/models/car.dart
@@ -1,9 +1,10 @@
 library angel_orm.generator.models.car;
 
-import 'package:angel_framework/common.dart';
+import 'package:angel_model/angel_model.dart';
 import 'package:angel_orm/angel_orm.dart';
 import 'package:angel_serialize/angel_serialize.dart';
 part 'car.g.dart';
+part 'car.serializer.g.dart';
 
 @serializable
 @orm
diff --git a/angel_orm_generator/test/models/customer.dart b/angel_orm_generator/test/models/customer.dart
index b38e5631..0808bdfa 100644
--- a/angel_orm_generator/test/models/customer.dart
+++ b/angel_orm_generator/test/models/customer.dart
@@ -4,6 +4,7 @@ import 'package:angel_model/angel_model.dart';
 import 'package:angel_orm/angel_orm.dart';
 import 'package:angel_serialize/angel_serialize.dart';
 part 'customer.g.dart';
+part 'customer.serializer.g.dart';
 
 @orm
 @serializable
diff --git a/angel_orm_generator/test/models/foot.dart b/angel_orm_generator/test/models/foot.dart
index d41f99f8..39c57947 100644
--- a/angel_orm_generator/test/models/foot.dart
+++ b/angel_orm_generator/test/models/foot.dart
@@ -4,6 +4,7 @@ import 'package:angel_model/angel_model.dart';
 import 'package:angel_orm/angel_orm.dart';
 import 'package:angel_serialize/angel_serialize.dart';
 part 'foot.g.dart';
+part 'foot.serializer.g.dart';
 
 @serializable
 @orm
diff --git a/angel_orm_generator/test/models/fruit.dart b/angel_orm_generator/test/models/fruit.dart
index d9ae8ff4..3af538ed 100644
--- a/angel_orm_generator/test/models/fruit.dart
+++ b/angel_orm_generator/test/models/fruit.dart
@@ -4,6 +4,7 @@ import 'package:angel_model/angel_model.dart';
 import 'package:angel_orm/angel_orm.dart';
 import 'package:angel_serialize/angel_serialize.dart';
 part 'fruit.g.dart';
+part 'fruit.serializer.g.dart';
 
 @serializable
 @orm
diff --git a/angel_orm_generator/test/models/leg.dart b/angel_orm_generator/test/models/leg.dart
index 8b2e6efa..365fa357 100644
--- a/angel_orm_generator/test/models/leg.dart
+++ b/angel_orm_generator/test/models/leg.dart
@@ -5,6 +5,7 @@ import 'package:angel_orm/angel_orm.dart';
 import 'package:angel_serialize/angel_serialize.dart';
 import 'foot.dart';
 part 'leg.g.dart';
+part 'leg.serializer.g.dart';
 
 @serializable
 @orm
diff --git a/angel_orm_generator/test/models/order.dart b/angel_orm_generator/test/models/order.dart
index 1125dd9f..7b529062 100644
--- a/angel_orm_generator/test/models/order.dart
+++ b/angel_orm_generator/test/models/order.dart
@@ -5,6 +5,7 @@ import 'package:angel_orm/angel_orm.dart';
 import 'package:angel_serialize/angel_serialize.dart';
 import 'customer.dart';
 part 'order.g.dart';
+part 'order.serializer.g.dart';
 
 @orm
 @serializable
diff --git a/angel_orm_generator/test/models/role.dart b/angel_orm_generator/test/models/role.dart
index 95c72c61..ae27ec7a 100644
--- a/angel_orm_generator/test/models/role.dart
+++ b/angel_orm_generator/test/models/role.dart
@@ -4,6 +4,7 @@ import 'package:angel_model/angel_model.dart';
 import 'package:angel_orm/angel_orm.dart';
 import 'package:angel_serialize/angel_serialize.dart';
 part 'role.g.dart';
+part 'role.serializer.g.dart';
 
 @serializable
 @orm
diff --git a/angel_orm_generator/test/models/tree.dart b/angel_orm_generator/test/models/tree.dart
index 01c946a8..ceb93600 100644
--- a/angel_orm_generator/test/models/tree.dart
+++ b/angel_orm_generator/test/models/tree.dart
@@ -5,11 +5,12 @@ import 'package:angel_orm/angel_orm.dart';
 import 'package:angel_serialize/angel_serialize.dart';
 import 'fruit.dart';
 part 'tree.g.dart';
+part 'tree.serializer.g.dart';
 
 @serializable
 @orm
 class _Tree extends Model {
-  @Column(indexType: IndexType.UNIQUE, type: ColumnType.smallInt)
+  @Column(indexType: IndexType.unique, type: ColumnType.smallInt)
   int rings;
 
   @hasMany
diff --git a/angel_orm_generator/test/models/user.dart b/angel_orm_generator/test/models/user.dart
index 9c587b01..7588cf62 100644
--- a/angel_orm_generator/test/models/user.dart
+++ b/angel_orm_generator/test/models/user.dart
@@ -5,6 +5,7 @@ import 'package:angel_orm/angel_orm.dart';
 import 'package:angel_serialize/angel_serialize.dart';
 import 'role.dart';
 part 'user.g.dart';
+part 'user.serializer.g.dart';
 
 @serializable
 @orm