diff --git a/powerstats/ZumaCommonDataProviders.cpp b/powerstats/ZumaCommonDataProviders.cpp
index 8fbb63c1..dfac6d0c 100644
--- a/powerstats/ZumaCommonDataProviders.cpp
+++ b/powerstats/ZumaCommonDataProviders.cpp
@@ -349,8 +349,19 @@ void addCPUclusters(std::shared_ptr<PowerStats> p) {
     };
 
     std::vector<GenericStateResidencyDataProvider::PowerEntityConfig> cfgs;
-    for (std::string name : {"CORE00", "CORE01", "CORE02", "CORE03", "CORE10", "CORE11",
-                                "CORE20", "CORE21", "CLUSTER0", "CLUSTER1", "CLUSTER2"}) {
+    for (std::string name : {
+            "CORE00",
+            "CORE01",
+            "CORE02",
+            "CORE03",
+            "CORE10",
+            "CORE11",
+            "CORE12",
+            "CORE13",
+            "CORE21",
+            "CLUSTER0",
+            "CLUSTER1",
+            "CLUSTER2"}) {
         cfgs.emplace_back(generateGenericStateResidencyConfigs(cpuStateConfig, cpuStateHeaders),
             name, name);
     }
diff --git a/powerstats/include/ZumaCommonDataProviders.h b/powerstats/include/ZumaCommonDataProviders.h
index 15b8050f..054e422e 100644
--- a/powerstats/include/ZumaCommonDataProviders.h
+++ b/powerstats/include/ZumaCommonDataProviders.h
@@ -20,6 +20,20 @@
 
 using aidl::android::hardware::power::stats::PowerStats;
 
-void addZumaCommonDataProviders(std::shared_ptr<PowerStats> p);
-
+void addAoC(std::shared_ptr<PowerStats> p);
+void addCPUclusters(std::shared_ptr<PowerStats> p);
+void addDevfreq(std::shared_ptr<PowerStats> p);
+void addDvfsStats(std::shared_ptr<PowerStats> p);
+void addGNSS(std::shared_ptr<PowerStats> p);
+void addGPU(std::shared_ptr<PowerStats> p);
+void addMobileRadio(std::shared_ptr<PowerStats> p);
 void addNFC(std::shared_ptr<PowerStats> p, const std::string& path);
+void addPCIe(std::shared_ptr<PowerStats> p);
+void addPixelStateResidencyDataProvider(std::shared_ptr<PowerStats> p);
+void addPowerDomains(std::shared_ptr<PowerStats> p);
+void addSoC(std::shared_ptr<PowerStats> p);
+void addTPU(std::shared_ptr<PowerStats> p);
+void addUfs(std::shared_ptr<PowerStats> p);
+void addWifi(std::shared_ptr<PowerStats> p);
+void addZumaCommonDataProviders(std::shared_ptr<PowerStats> p);
+void setEnergyMeter(std::shared_ptr<PowerStats> p);