Move legacy data providers