DEI metrics grouping

(based on STI only)