Improve the DataProvider