[FEAT] some modifications to how we store and edit the tracked kpis