Updated data migration