Migrate more methods
Migrate more methods