Refactoring data providers.