diff --git a/library.json b/library.json
index 43bc52a..109d774 100644
--- a/library.json
+++ b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "ESP-Google-Sheet-Client",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "keywords": "communication, REST, esp32, esp8266, raspberrypi, arduino",
   "description": "Arduino Google Sheet REST client library for ESP8266, ESP32 and Raspberry Pi Pico (RP2040). This library allows devices to communicate with Google Sheet API to read, edit and delete the spreadsheets",
   "repository": {
diff --git a/library.properties b/library.properties
index c82ae65..7ff66a9 100644
--- a/library.properties
+++ b/library.properties
@@ -1,6 +1,6 @@
 name=ESP-Google-Sheet-Client
 
-version=1.3.5
+version=1.3.6
 
 author=Mobizt
 
diff --git a/src/ESP_Google_Sheet_Client.cpp b/src/ESP_Google_Sheet_Client.cpp
index 30128bd..8b4b34a 100644
--- a/src/ESP_Google_Sheet_Client.cpp
+++ b/src/ESP_Google_Sheet_Client.cpp
@@ -1,9 +1,9 @@
 /**
- * Google Sheet Client, GS_Google_Sheet_Client.cpp v1.3.5
+ * Google Sheet Client, GS_Google_Sheet_Client.cpp v1.3.6
  *
  * This library supports Espressif ESP8266 and ESP32 MCUs
  *
- * Created March 5, 2023
+ * Created June 19, 2023
  *
  * The MIT License (MIT)
  * Copyright (c) 2022 K. Suwatchai (Mobizt)
diff --git a/src/ESP_Google_Sheet_Client.h b/src/ESP_Google_Sheet_Client.h
index 2e9e457..68217c8 100644
--- a/src/ESP_Google_Sheet_Client.h
+++ b/src/ESP_Google_Sheet_Client.h
@@ -1,13 +1,13 @@
 #ifndef ESP_GOOGLE_SHEET_CLIENT_VERSION
-#define ESP_GOOGLE_SHEET_CLIENT_VERSION "1.3.5"
+#define ESP_GOOGLE_SHEET_CLIENT_VERSION "1.3.6"
 #endif
 
 /**
- * Google Sheet Client, ESP_Google_Sheet_Client.h v1.3.5
+ * Google Sheet Client, ESP_Google_Sheet_Client.h v1.3.6
  *
  * This library supports Espressif ESP8266 and ESP32 MCUs
  *
- * Created March 5, 2023
+ * Created June 19, 2023
  *
  * The MIT License (MIT)
  * Copyright (c) 2023 K. Suwatchai (Mobizt)
diff --git a/src/client/GS_TCP_Client.h b/src/client/GS_TCP_Client.h
index 84dbb2c..057ca58 100644
--- a/src/client/GS_TCP_Client.h
+++ b/src/client/GS_TCP_Client.h
@@ -40,7 +40,9 @@ extern "C"
 
 #include <WiFi.h>
 #include <WiFiClient.h>
+#if !defined(ESP_GOOGLE_SHEET_CLIENT_ENABLE_EXTERNAL_CLIENT)
 #include <ETH.h>
+#endif
 #include <WiFiClientSecure.h>
 #if __has_include(<esp_idf_version.h>)
 #include <esp_idf_version.h>
diff --git a/src/mbfs/MB_FS.h b/src/mbfs/MB_FS.h
index 58df1a2..9674062 100644
--- a/src/mbfs/MB_FS.h
+++ b/src/mbfs/MB_FS.h
@@ -1,9 +1,9 @@
 /**
- * The MB_FS, filesystems wrapper class v1.0.15
+ * The MB_FS, filesystems wrapper class v1.0.16
  *
  * This wrapper class is for SD and Flash filesystems interface which supports SdFat (//https://github.com/greiman/SdFat)
  *
- *  Created March 5, 2023
+ *  Created June 14, 2023
  *
  * The MIT License (MIT)
  * Copyright (c) 2023 K. Suwatchai (Mobizt)
@@ -31,15 +31,20 @@
 #define MBFS_CLASS_H
 
 #include <Arduino.h>
-#include "mbfs/MB_MCU.h"
+#include "MB_MCU.h"
 
 #define FS_NO_GLOBALS
 #if defined(ESP32) || defined(ESP8266) || defined(MB_ARDUINO_PICO)
+#if defined(MBFS_FLASH_FS) || defined(MBFS_SD_FS)
 #include <FS.h>
 #endif
+#endif
 #include "MB_FS_Interfaces.h"
 #include MB_STRING_INCLUDE_CLASS
+
+#if defined(MBFS_FLASH_FS) || defined(MBFS_SD_FS)
 #include "SPI.h"
+#endif
 
 #if defined(ESP32) && __has_include(<sys/stat.h>)
 #ifdef _LITTLEFS_H_