Some changes to migrations, data context