KPI module support

ah - gotcha