diff --git a/FIREBASE/Cloud_Firestore_Application/1_Network_Class/1_Network_Class.ino b/FIREBASE/Cloud_Firestore_Application/1_Network_Class/1_Network_Class.ino
index 553baf9..2d32a99 100644
--- a/FIREBASE/Cloud_Firestore_Application/1_Network_Class/1_Network_Class.ino
+++ b/FIREBASE/Cloud_Firestore_Application/1_Network_Class/1_Network_Class.ino
@@ -6,6 +6,10 @@
 */
 /////////////////////////////////////////////////////////////////
 
+// 05-06-2024 
+// Code Updated - Network Class
+// Tested ESP32 Version - 2.0.16
+
 #include "DHTesp.h"  // Click here to get the library: http://librarymanager/All#DHTesp
 #include <Ticker.h>
 #include "Display.h"
diff --git a/FIREBASE/Cloud_Firestore_Application/1_Network_Class/Network.cpp b/FIREBASE/Cloud_Firestore_Application/1_Network_Class/Network.cpp
index 5bff93a..0a84113 100644
--- a/FIREBASE/Cloud_Firestore_Application/1_Network_Class/Network.cpp
+++ b/FIREBASE/Cloud_Firestore_Application/1_Network_Class/Network.cpp
@@ -1,7 +1,7 @@
 #include "Network.h"
 
-#define WIFI_SSID "ThatProject"
-#define WIFI_PASSWORD "California"
+#define WIFI_SSID "<YOUR_WIFI_SSID>"
+#define WIFI_PASSWORD "<YOUR_WIFI_PASSWORD>"
 
 Network::Network() {
 }
@@ -22,8 +22,8 @@ void WiFiEventDisconnected(WiFiEvent_t event, WiFiEventInfo_t info) {
 
 void Network::initWiFi() {
   WiFi.disconnect();
-  WiFi.onEvent(WiFiEventConnected, SYSTEM_EVENT_STA_CONNECTED);
-  WiFi.onEvent(WiFiEventGotIP, SYSTEM_EVENT_STA_GOT_IP);
-  WiFi.onEvent(WiFiEventDisconnected, SYSTEM_EVENT_STA_DISCONNECTED);
+  WiFi.onEvent(WiFiEventConnected, ARDUINO_EVENT_WIFI_STA_CONNECTED);
+  WiFi.onEvent(WiFiEventGotIP, ARDUINO_EVENT_WIFI_STA_GOT_IP);
+  WiFi.onEvent(WiFiEventDisconnected, ARDUINO_EVENT_WIFI_STA_DISCONNECTED);
   WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
 }
\ No newline at end of file
diff --git a/FIREBASE/Cloud_Firestore_Application/2_Firebase_Client/2_Firebase_Client.ino b/FIREBASE/Cloud_Firestore_Application/2_Firebase_Client/2_Firebase_Client.ino
index 64bf1d9..b9bdab2 100644
--- a/FIREBASE/Cloud_Firestore_Application/2_Firebase_Client/2_Firebase_Client.ino
+++ b/FIREBASE/Cloud_Firestore_Application/2_Firebase_Client/2_Firebase_Client.ino
@@ -6,6 +6,10 @@
 */
 /////////////////////////////////////////////////////////////////
 
+// 05-06-2024 
+// Code Updated - Network Class
+// Tested ESP32 Version - 2.0.16
+
 #include "DHTesp.h" // Click here to get the library: http://librarymanager/All#DHTesp
 #include <Ticker.h>
 #include "Display.h"
diff --git a/FIREBASE/Cloud_Firestore_Application/2_Firebase_Client/Network.cpp b/FIREBASE/Cloud_Firestore_Application/2_Firebase_Client/Network.cpp
index 60f60c8..cb66173 100644
--- a/FIREBASE/Cloud_Firestore_Application/2_Firebase_Client/Network.cpp
+++ b/FIREBASE/Cloud_Firestore_Application/2_Firebase_Client/Network.cpp
@@ -31,14 +31,14 @@ void WiFiEventDisconnected(WiFiEvent_t event, WiFiEventInfo_t info){
 }
 
 void FirestoreTokenStatusCallback(TokenInfo info){
-  Serial.printf("Token Info: type = %s, status = %s\n", getTokenType(info).c_str(), getTokenStatus(info).c_str());
+  Serial.printf("Token Info: type = %s, status = %s\n", getTokenType(info), getTokenStatus(info));
 }
 
 void Network::initWiFi(){
   WiFi.disconnect();
-  WiFi.onEvent(WiFiEventConnected, SYSTEM_EVENT_STA_CONNECTED);
-  WiFi.onEvent(WiFiEventGotIP, SYSTEM_EVENT_STA_GOT_IP);
-  WiFi.onEvent(WiFiEventDisconnected, SYSTEM_EVENT_STA_DISCONNECTED);
+  WiFi.onEvent(WiFiEventConnected, ARDUINO_EVENT_WIFI_STA_CONNECTED);
+  WiFi.onEvent(WiFiEventGotIP, ARDUINO_EVENT_WIFI_STA_GOT_IP);
+  WiFi.onEvent(WiFiEventDisconnected, ARDUINO_EVENT_WIFI_STA_DISCONNECTED);
   WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
 }
 
diff --git a/FIREBASE/Cloud_Firestore_Application/3_Display_Done/3_Display_Done.ino b/FIREBASE/Cloud_Firestore_Application/3_Display_Done/3_Display_Done.ino
index 3f192bb..971e9ba 100644
--- a/FIREBASE/Cloud_Firestore_Application/3_Display_Done/3_Display_Done.ino
+++ b/FIREBASE/Cloud_Firestore_Application/3_Display_Done/3_Display_Done.ino
@@ -6,6 +6,10 @@
 */
 /////////////////////////////////////////////////////////////////
 
+// 05-06-2024 
+// Code Updated - Network Class
+// Tested ESP32 Version - 2.0.16
+
 #include "DHTesp.h" // Click here to get the library: http://librarymanager/All#DHTesp
 #include <Ticker.h>
 #include "Display.h"
diff --git a/FIREBASE/Cloud_Firestore_Application/3_Display_Done/Network.cpp b/FIREBASE/Cloud_Firestore_Application/3_Display_Done/Network.cpp
index ec69ec1..1d5419c 100644
--- a/FIREBASE/Cloud_Firestore_Application/3_Display_Done/Network.cpp
+++ b/FIREBASE/Cloud_Firestore_Application/3_Display_Done/Network.cpp
@@ -36,7 +36,7 @@ void WiFiEventDisconnected(WiFiEvent_t event, WiFiEventInfo_t info){
 }
 
 void FirestoreTokenStatusCallback(TokenInfo info){
-  Serial.printf("Token Info: type = %s, status = %s\n", getTokenType(info).c_str(), getTokenStatus(info).c_str());
+  Serial.printf("Token Info: type = %s, status = %s\n", getTokenType(info), getTokenStatus(info));
   if(info.status == token_status_ready){
     instance->callBackEvent(FIREBASE_CONNECTED);
   }else{
@@ -46,9 +46,9 @@ void FirestoreTokenStatusCallback(TokenInfo info){
 
 void Network::initWiFi(){
   WiFi.disconnect();
-  WiFi.onEvent(WiFiEventConnected, SYSTEM_EVENT_STA_CONNECTED);
-  WiFi.onEvent(WiFiEventGotIP, SYSTEM_EVENT_STA_GOT_IP);
-  WiFi.onEvent(WiFiEventDisconnected, SYSTEM_EVENT_STA_DISCONNECTED);
+  WiFi.onEvent(WiFiEventConnected, ARDUINO_EVENT_WIFI_STA_CONNECTED);
+  WiFi.onEvent(WiFiEventGotIP, ARDUINO_EVENT_WIFI_STA_GOT_IP);
+  WiFi.onEvent(WiFiEventDisconnected, ARDUINO_EVENT_WIFI_STA_DISCONNECTED);
   WiFi.begin(WIFI_SSID, WIFI_PASSWORD);
 }