Migrate more methods