add couple of new kpis, change some names  f-me/carma#1707