Restructured kpis collection with draft, published keys