diff --git a/packages/orm/angel_orm_generator/CHANGELOG.md b/packages/orm/angel_orm_generator/CHANGELOG.md
index 1ddfef75..10cdb2ad 100644
--- a/packages/orm/angel_orm_generator/CHANGELOG.md
+++ b/packages/orm/angel_orm_generator/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 6.1.0
+
+* Updated to `analyzer` 4.x.x
+
 ## 6.0.1
 
 * Fixed timestamp or date field to DateTime mapping
diff --git a/packages/orm/angel_orm_generator/lib/src/orm_build_context.dart b/packages/orm/angel_orm_generator/lib/src/orm_build_context.dart
index cef4823d..0a2a853f 100644
--- a/packages/orm/angel_orm_generator/lib/src/orm_build_context.dart
+++ b/packages/orm/angel_orm_generator/lib/src/orm_build_context.dart
@@ -426,9 +426,10 @@ class _ColumnType implements ColumnType {
   final String name;
 
   @override
-  final bool hasSize;
+  final bool hasSize = false;
 
-  _ColumnType(this.name, [this.hasSize = false]);
+  //_ColumnType(this.name, [this.hasSize = false]);
+  _ColumnType(this.name);
 }
 
 class RelationFieldImpl extends ShimFieldImpl {
diff --git a/packages/orm/angel_orm_generator/pubspec.yaml b/packages/orm/angel_orm_generator/pubspec.yaml
index 9ec5f75f..d1204d70 100644
--- a/packages/orm/angel_orm_generator/pubspec.yaml
+++ b/packages/orm/angel_orm_generator/pubspec.yaml
@@ -10,7 +10,7 @@ dependencies:
   angel3_serialize: ^6.0.0
   angel3_orm: ^6.0.0
   angel3_serialize_generator: ^6.0.0
-  analyzer: ^3.0.0
+  analyzer: ^4.0.0
   inflection3: ^0.5.3+1
   build: ^2.0.1
   build_config: ^1.0.0
@@ -30,7 +30,7 @@ dev_dependencies:
   postgres: ^2.4.0
   test: ^1.21.0
   lints: ^1.0.0
-# dependency_overrides:
+dependency_overrides:
 #   angel3_container:
 #     path: ../../container/angel_container
 #   angel3_framework:
@@ -45,8 +45,8 @@ dev_dependencies:
 #     path: ../../mock_request
 #   angel3_serialize:
 #     path: ../../serialize/angel_serialize
-#   angel3_serialize_generator:
-#     path: ../../serialize/angel_serialize_generator
+  angel3_serialize_generator:
+    path: ../../serialize/angel_serialize_generator
 #   angel3_orm:
 #     path: ../angel_orm
 #   angel3_migration:
diff --git a/packages/serialize/angel_serialize_generator/CHANGELOG.md b/packages/serialize/angel_serialize_generator/CHANGELOG.md
index c64dc2fa..aabe632b 100644
--- a/packages/serialize/angel_serialize_generator/CHANGELOG.md
+++ b/packages/serialize/angel_serialize_generator/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 6.1.0
+
+* Updated to `analyzer` 4.x.x
+
 ## 6.0.0
 
 * Updated to SDK 2.16.x
diff --git a/packages/serialize/angel_serialize_generator/pubspec.yaml b/packages/serialize/angel_serialize_generator/pubspec.yaml
index 9607a2a7..2067cfb5 100644
--- a/packages/serialize/angel_serialize_generator/pubspec.yaml
+++ b/packages/serialize/angel_serialize_generator/pubspec.yaml
@@ -1,12 +1,12 @@
 name: angel3_serialize_generator
-version: 6.0.0
+version: 6.1.0
 description: Angel3 model serialization generators, designed for use with Angel. Combine with angel_serialize for flexible modeling.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/serialize/angel_serialize_generator
 environment:
   sdk: '>=2.16.0 <3.0.0'
 dependencies:
-  analyzer: ^3.0.0
+  analyzer: ^4.1.0
   angel3_model: ^6.0.0
   angel3_serialize: ^6.0.0
   belatuk_code_buffer: ^3.0.0