Migrate more methods
Rename method
Migrate more methods