Moving data provider to service instead of module