Updated DataProvider Factories