diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e7dfd07..bbef49ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@
 * Added mock_request and migrated to 2.0.0 (5/5 tests)
 * Migrated angel_framework to 4.0.0 (149/150 tests passed)
 * Migrated angel_auth to 4.0.0 (31/31 tests passed)
-* Migrated angel_configuration to 4.0.0 (6/8 testspassed)
+* Migrated angel_configuration to 4.0.0 (8/8 testspassed)
 * Migrated angel_validate to 4.0.0 (6/7 tests passed)
 * Migrated json_god to 4.0.0 (13/13 tests passed)
 * Migrated angel_client to 4.0.0 (6/13 tests passed)
diff --git a/TODO.md b/TODO.md
index f26ae454..0a7c337b 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,12 +4,10 @@
 
 * Migrate all modules to support NNBD
 * Fix issues and failed unit test
+  * Validate
   * Client
   * Websocket
-  * Configuration
-  * Validate
   * ORM
-  * Framework
 * Add more examples
 * Improve User Guide
 * Update `Angel3` website