data migration improvements