Some changes in migration engine