Added KPI module and Order module integration