Enhancing Kpi view data provider