diff --git a/extras/doc/u-blox SARA-U2 DataSheet (UBX-13005287).pdf b/extras/doc/u-blox SARA-U2 DataSheet (UBX-13005287).pdf
new file mode 100644
index 0000000..6c9a441
Binary files /dev/null and b/extras/doc/u-blox SARA-U2 DataSheet (UBX-13005287).pdf differ
diff --git a/extras/doc/u-blox SARA-U2 ProductSummary (UBX-13004142).pdf b/extras/doc/u-blox SARA-U2 ProductSummary (UBX-13004142).pdf
new file mode 100644
index 0000000..763902a
Binary files /dev/null and b/extras/doc/u-blox SARA-U2 ProductSummary (UBX-13004142).pdf differ
diff --git a/src/TinyGsmClientA6.h b/src/TinyGsmClientA6.h
index bad5e09..9934396 100644
--- a/src/TinyGsmClientA6.h
+++ b/src/TinyGsmClientA6.h
@@ -408,6 +408,8 @@ public:
   /*
    * WiFi functions
    */
+  bool networkConnect(const char* ssid, const char* pwd) TINY_GSM_ATTR_NOT_AVAILABLE;
+  bool networkDisconnect() TINY_GSM_ATTR_NOT_AVAILABLE;
 
   /*
    * GPRS functions
@@ -415,9 +417,8 @@ public:
   bool gprsConnect(const char* apn, const char* user = NULL, const char* pwd = NULL) {
     gprsDisconnect();
 
-    sendAT(GF("+CGATT=1"));
-    if (waitResponse(60000L) != 1)
-      return false;
+    sendAT(GF("EE"), 2);  // Set security to WPA2
+    if (waitResponse() != 1) goto fail;
 
     // TODO: wait AT+CGATT?
 
diff --git a/src/TinyGsmClientBG96.h b/src/TinyGsmClientBG96.h
index b68ba87..8b0078d 100644
--- a/src/TinyGsmClientBG96.h
+++ b/src/TinyGsmClientBG96.h
@@ -441,6 +441,8 @@ public:
   /*
    * WiFi functions
    */
+  bool networkConnect(const char* ssid, const char* pwd) TINY_GSM_ATTR_NOT_AVAILABLE;
+  bool networkDisconnect() TINY_GSM_ATTR_NOT_AVAILABLE;
 
   /*
    * GPRS functions
diff --git a/src/TinyGsmClientESP8266.h b/src/TinyGsmClientESP8266.h
index 62c9ece..de84295 100644
--- a/src/TinyGsmClientESP8266.h
+++ b/src/TinyGsmClientESP8266.h
@@ -408,6 +408,8 @@ public:
   /*
    * GPRS functions
    */
+  bool gprsConnect(const char* apn, const char* user = NULL, const char* pwd = NULL) TINY_GSM_ATTR_NOT_AVAILABLE;
+  bool gprsDisconnect() TINY_GSM_ATTR_NOT_AVAILABLE;
 
   /*
    * Messaging functions
diff --git a/src/TinyGsmClientM590.h b/src/TinyGsmClientM590.h
index 564c574..787e9b6 100644
--- a/src/TinyGsmClientM590.h
+++ b/src/TinyGsmClientM590.h
@@ -417,6 +417,8 @@ public:
   /*
    * WiFi functions
    */
+  bool networkConnect(const char* ssid, const char* pwd) TINY_GSM_ATTR_NOT_AVAILABLE;
+  bool networkDisconnect() TINY_GSM_ATTR_NOT_AVAILABLE;
 
   /*
    * GPRS functions
diff --git a/src/TinyGsmClientSIM800.h b/src/TinyGsmClientSIM800.h
index 5660c7c..9e02038 100644
--- a/src/TinyGsmClientSIM800.h
+++ b/src/TinyGsmClientSIM800.h
@@ -462,6 +462,12 @@ public:
     return false;
   }
 
+  /*
+   * WiFi functions
+   */
+  bool networkConnect(const char* ssid, const char* pwd) TINY_GSM_ATTR_NOT_AVAILABLE;
+  bool networkDisconnect() TINY_GSM_ATTR_NOT_AVAILABLE;
+
   /*
    * GPRS functions
    */
diff --git a/src/TinyGsmClientUBLOX.h b/src/TinyGsmClientUBLOX.h
index f7d9c87..9055677 100644
--- a/src/TinyGsmClientUBLOX.h
+++ b/src/TinyGsmClientUBLOX.h
@@ -440,6 +440,8 @@ public:
   /*
    * WiFi functions
    */
+  bool networkConnect(const char* ssid, const char* pwd) TINY_GSM_ATTR_NOT_AVAILABLE;
+  bool networkDisconnect() TINY_GSM_ATTR_NOT_AVAILABLE;
 
   /*
    * GPRS functions