Fix dataProvider mapping