Data providers overhaul