Refactored data provider into own to be shared