Migrate model 2 to model 3