Enhanced the Data Provider system