Updated services for kpis