[WIP] - support KPI modules