diff --git a/examples/BASIC/BASIC.ino b/examples/BASIC/BASIC.ino
index 97105fb..cac722b 100644
--- a/examples/BASIC/BASIC.ino
+++ b/examples/BASIC/BASIC.ino
@@ -55,7 +55,7 @@ CC BY-SA 4.0 Attribution-ShareAlike 4.0 International License
 static AirGradient ag(DIY_BASIC);
 static Configuration configuration(Serial);
 static AgApiClient apiClient(Serial, configuration);
-static Measurements measurements;
+static Measurements measurements(configuration);
 static OledDisplay oledDisplay(configuration, measurements, Serial);
 static StateMachine stateMachine(oledDisplay, Serial, measurements,
                                  configuration);
@@ -124,6 +124,7 @@ void setup() {
   apiClient.setAirGradient(&ag);
   openMetrics.setAirGradient(&ag);
   localServer.setAirGraident(&ag);
+  measurements.setAirGradient(&ag);
 
   /** Example set custom API root URL */
   // apiClient.setApiRoot("https://example.custom.api");
@@ -316,7 +317,7 @@ static void mqttHandle(void) {
   }
 
   if (mqttClient.isConnected()) {
-    String payload = measurements.toString(true, fwMode, wifiConnector.RSSI(), ag, configuration);
+    String payload = measurements.toString(true, fwMode, wifiConnector.RSSI());
     String topic = "airgradient/readings/" + ag.deviceId();
     if (mqttClient.publish(topic.c_str(), payload.c_str(), payload.length())) {
       Serial.println("MQTT sync success");
@@ -527,7 +528,7 @@ static void sendDataToServer(void) {
     return;
   }
 
-  String syncData = measurements.toString(false, fwMode, wifiConnector.RSSI(), ag, configuration);
+  String syncData = measurements.toString(false, fwMode, wifiConnector.RSSI());
   if (apiClient.postToServer(syncData)) {
     Serial.println();
     Serial.println(
diff --git a/examples/BASIC/LocalServer.cpp b/examples/BASIC/LocalServer.cpp
index 61a6dfb..caba5f1 100644
--- a/examples/BASIC/LocalServer.cpp
+++ b/examples/BASIC/LocalServer.cpp
@@ -53,7 +53,7 @@ void LocalServer::_GET_metrics(void) {
 }
 
 void LocalServer::_GET_measure(void) {
-  String toSend = measure.toString(true, fwMode, wifiConnector.RSSI(), *ag, config);
+  String toSend = measure.toString(true, fwMode, wifiConnector.RSSI());
   server.send(200, "application/json", toSend);
 }
 
diff --git a/examples/BASIC/OpenMetrics.cpp b/examples/BASIC/OpenMetrics.cpp
index c8395c0..9ceddcb 100644
--- a/examples/BASIC/OpenMetrics.cpp
+++ b/examples/BASIC/OpenMetrics.cpp
@@ -81,7 +81,7 @@ String OpenMetrics::getPayload(void) {
 
   if (config.hasSensorPMS1) {
     pm01 = measure.get(Measurements::PM01);
-    float correctedPm = measure.getCorrectedPM25(*ag, config, false, 1);
+    float correctedPm = measure.getCorrectedPM25(false, 1);
     pm25 = round(correctedPm);
     pm10 = measure.get(Measurements::PM10);
     pm03PCount = measure.get(Measurements::PM03_PC);
diff --git a/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino b/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino
index bd19b86..aa4ac4b 100644
--- a/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino
+++ b/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino
@@ -55,7 +55,7 @@ CC BY-SA 4.0 Attribution-ShareAlike 4.0 International License
 static AirGradient ag(DIY_PRO_INDOOR_V3_3);
 static Configuration configuration(Serial);
 static AgApiClient apiClient(Serial, configuration);
-static Measurements measurements;
+static Measurements measurements(configuration);
 static OledDisplay oledDisplay(configuration, measurements, Serial);
 static StateMachine stateMachine(oledDisplay, Serial, measurements,
                                  configuration);
@@ -124,6 +124,7 @@ void setup() {
   apiClient.setAirGradient(&ag);
   openMetrics.setAirGradient(&ag);
   localServer.setAirGraident(&ag);
+  measurements.setAirGradient(&ag);
 
   /** Example set custom API root URL */
   // apiClient.setApiRoot("https://example.custom.api");
@@ -373,7 +374,7 @@ static void mqttHandle(void) {
   }
 
   if (mqttClient.isConnected()) {
-    String payload = measurements.toString(true, fwMode, wifiConnector.RSSI(), ag, configuration);
+    String payload = measurements.toString(true, fwMode, wifiConnector.RSSI());
     String topic = "airgradient/readings/" + ag.deviceId();
     if (mqttClient.publish(topic.c_str(), payload.c_str(), payload.length())) {
       Serial.println("MQTT sync success");
@@ -579,7 +580,7 @@ static void sendDataToServer(void) {
     return;
   }
 
-  String syncData = measurements.toString(false, fwMode, wifiConnector.RSSI(), ag, configuration);
+  String syncData = measurements.toString(false, fwMode, wifiConnector.RSSI());
   if (apiClient.postToServer(syncData)) {
     Serial.println();
     Serial.println(
diff --git a/examples/DiyProIndoorV3_3/LocalServer.cpp b/examples/DiyProIndoorV3_3/LocalServer.cpp
index 61a6dfb..caba5f1 100644
--- a/examples/DiyProIndoorV3_3/LocalServer.cpp
+++ b/examples/DiyProIndoorV3_3/LocalServer.cpp
@@ -53,7 +53,7 @@ void LocalServer::_GET_metrics(void) {
 }
 
 void LocalServer::_GET_measure(void) {
-  String toSend = measure.toString(true, fwMode, wifiConnector.RSSI(), *ag, config);
+  String toSend = measure.toString(true, fwMode, wifiConnector.RSSI());
   server.send(200, "application/json", toSend);
 }
 
diff --git a/examples/DiyProIndoorV3_3/OpenMetrics.cpp b/examples/DiyProIndoorV3_3/OpenMetrics.cpp
index 8ec9d2f..5984c0d 100644
--- a/examples/DiyProIndoorV3_3/OpenMetrics.cpp
+++ b/examples/DiyProIndoorV3_3/OpenMetrics.cpp
@@ -81,7 +81,7 @@ String OpenMetrics::getPayload(void) {
 
   if (config.hasSensorPMS1) {
     pm01 = measure.get(Measurements::PM01);
-    float correctedPm = measure.getCorrectedPM25(*ag, config, false, 1);
+    float correctedPm = measure.getCorrectedPM25(false, 1);
     pm25 = round(correctedPm);
     pm10 = measure.get(Measurements::PM10);
     pm03PCount = measure.get(Measurements::PM03_PC);
diff --git a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino
index f29c2cf..ea35864 100644
--- a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino
+++ b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino
@@ -55,7 +55,7 @@ CC BY-SA 4.0 Attribution-ShareAlike 4.0 International License
 static AirGradient ag(DIY_PRO_INDOOR_V4_2);
 static Configuration configuration(Serial);
 static AgApiClient apiClient(Serial, configuration);
-static Measurements measurements;
+static Measurements measurements(configuration);
 static OledDisplay oledDisplay(configuration, measurements, Serial);
 static StateMachine stateMachine(oledDisplay, Serial, measurements,
                                  configuration);
@@ -125,6 +125,7 @@ void setup() {
   apiClient.setAirGradient(&ag);
   openMetrics.setAirGradient(&ag);
   localServer.setAirGraident(&ag);
+  measurements.setAirGradient(&ag);
 
   /** Example set custom API root URL */
   // apiClient.setApiRoot("https://example.custom.api");
@@ -396,7 +397,7 @@ static void mqttHandle(void) {
   }
 
   if (mqttClient.isConnected()) {
-    String payload = measurements.toString(true, fwMode, wifiConnector.RSSI(), ag, configuration);
+    String payload = measurements.toString(true, fwMode, wifiConnector.RSSI());
     String topic = "airgradient/readings/" + ag.deviceId();
     if (mqttClient.publish(topic.c_str(), payload.c_str(), payload.length())) {
       Serial.println("MQTT sync success");
@@ -620,7 +621,7 @@ static void sendDataToServer(void) {
     return;
   }
 
-  String syncData = measurements.toString(false, fwMode, wifiConnector.RSSI(), ag, configuration);
+  String syncData = measurements.toString(false, fwMode, wifiConnector.RSSI());
   if (apiClient.postToServer(syncData)) {
     Serial.println();
     Serial.println(
diff --git a/examples/DiyProIndoorV4_2/LocalServer.cpp b/examples/DiyProIndoorV4_2/LocalServer.cpp
index 61a6dfb..caba5f1 100644
--- a/examples/DiyProIndoorV4_2/LocalServer.cpp
+++ b/examples/DiyProIndoorV4_2/LocalServer.cpp
@@ -53,7 +53,7 @@ void LocalServer::_GET_metrics(void) {
 }
 
 void LocalServer::_GET_measure(void) {
-  String toSend = measure.toString(true, fwMode, wifiConnector.RSSI(), *ag, config);
+  String toSend = measure.toString(true, fwMode, wifiConnector.RSSI());
   server.send(200, "application/json", toSend);
 }
 
diff --git a/examples/DiyProIndoorV4_2/OpenMetrics.cpp b/examples/DiyProIndoorV4_2/OpenMetrics.cpp
index c8395c0..9ceddcb 100644
--- a/examples/DiyProIndoorV4_2/OpenMetrics.cpp
+++ b/examples/DiyProIndoorV4_2/OpenMetrics.cpp
@@ -81,7 +81,7 @@ String OpenMetrics::getPayload(void) {
 
   if (config.hasSensorPMS1) {
     pm01 = measure.get(Measurements::PM01);
-    float correctedPm = measure.getCorrectedPM25(*ag, config, false, 1);
+    float correctedPm = measure.getCorrectedPM25(false, 1);
     pm25 = round(correctedPm);
     pm10 = measure.get(Measurements::PM10);
     pm03PCount = measure.get(Measurements::PM03_PC);