Migrations and Update Changes round 2

More migrations!