Migrate more classes