added better backfilling on migrations