Migrations

There are a few changes I put here for migrations.