Refactored DataProviders - some doesn't use builders now as they are not
needed.