Simplification of the KPI Service, now using KPIKey for arguments