Fix data provider endpoint service usage