Refactoring for the data provider.