Update to include DataProvider
Updated with DataProvider