Added classes for KPI calculations