Added some random stuff around dataProviders