Migrate a few more classes