diff --git a/platformio/libsetup.py b/platformio/libsetup.py
index ed690ae..fb97768 100644
--- a/platformio/libsetup.py
+++ b/platformio/libsetup.py
@@ -6,13 +6,13 @@
 #	https://github.com/cziter15/ksIotFrameworkLib/blob/master/LICENSE
 
 from logger import *
+ksPrintLog(Colors.Green, "Running extra script for library.")
 
 try:
 	Import("projenv", "env")
-	ksPrintLog(Colors.Green, "Running extra script for library.")
-
 	ksPrintLog(Colors.Magenta, "Building library environment list.")
 	environments = [env, DefaultEnvironment(), projenv]
+	
 	for lb in env.GetLibBuilders():
 		environments.append(lb.env)
 
@@ -25,9 +25,24 @@
 		e.ProcessFlags("-DCORE_DEBUG_LEVEL=0")
 		e.ProcessFlags("-DNO_GLOBAL_ARDUINO_OTA=1")
 		e.ProcessFlags("-DWEBSOCKETS_SAVE_RAM=1")
+		
+		# ESP32 version of Arduino has some changes for class names
+		if e["PIOPLATFORM"].startswith("espressif32"):
+			cpp_defines_dict = {}
+			for item in  e["CPPDEFINES"]:
+				if isinstance(item, tuple):
+					key, value = item
+					cpp_defines_dict[key] = value
+				elif isinstance(item, str):
+					cpp_defines_dict[item] = 1
+			if (int(cpp_defines_dict.get('ARDUINO', None)) >= 10812):
+				e.ProcessFlags("-DWiFiClientSecure=NetworkClientSecure")
+				e.ProcessFlags("-DWiFiClient=NetworkClient")
+				e.ProcessFlags("-DWiFiServer=NetworkServer")
+				e.ProcessFlags("-DWiFiUDP=NetworkUDP")
+				e.ProcessFlags("-DARDUINO_3_OR_ABOVE=1")
 
-	ksPrintLog(Colors.Magenta, "Successfully manipulated flags on [" + str(len(environments)) + "] environments.")
-
+	ksPrintLog(Colors.Magenta, "Successfully tweaked platform settings for [" + str(len(environments)) + "] environments.")
 	ksPrintLog(Colors.Green, "Extra script finished.")
 except BaseException as err:
 	ksPrintLog(Colors.Red, "Error while executing script. Are you on newest platformio core?")
diff --git a/src/ksf/comp/ksMqttConfigProvider.h b/src/ksf/comp/ksMqttConfigProvider.h
index b2b7a36..b520772 100644
--- a/src/ksf/comp/ksMqttConfigProvider.h
+++ b/src/ksf/comp/ksMqttConfigProvider.h
@@ -10,9 +10,6 @@
 #pragma once
 
 #include "ksConfigProvider.h"
-
-class WiFiManager;
-
 namespace ksf::comps
 {
 	class ksMqttConnector;
diff --git a/src/ksf/ksConstants.cpp b/src/ksf/ksConstants.cpp
index 22dda6a..a1cc9c3 100644
--- a/src/ksf/ksConstants.cpp
+++ b/src/ksf/ksConstants.cpp
@@ -40,17 +40,17 @@ namespace ksf
 	void initializeFramework()
 	{
 #ifdef ESP32
-		// TODO: In case of esp32 arduino 3
-		//esp_task_wdt_config_t twdt_config = {
-		//	.timeout_ms = KSF_WATCHDOG_TIMEOUT_SECS * 1000,
-		//	.idle_core_mask = (1 << CONFIG_SOC_CPU_CORES_NUM) - 1,		// Bitmask of all cores
-		//	.trigger_panic = false,
-		//};
-		//esp_task_wdt_init(&twdt_config);
-
+#if DARDUINO_3_OR_ABOVE
+		esp_task_wdt_config_t twdt_config = {
+			.timeout_ms = KSF_WATCHDOG_TIMEOUT_SECS * 1000,
+			.idle_core_mask = (1 << CONFIG_SOC_CPU_CORES_NUM) - 1,		// Bitmask of all cores
+			.trigger_panic = false,
+		};
+		esp_task_wdt_init(&twdt_config);
+#else
 		/* Setup watchdog. */
 		esp_task_wdt_init(KSF_WATCHDOG_TIMEOUT_SECS, true);
-
+#endif
 		/* Initialize filesystem. */
 		LittleFS.begin(true);
 #endif