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 266e13d..64ab6f1 100644
--- a/src/TinyGsmClientA6.h
+++ b/src/TinyGsmClientA6.h
@@ -404,6 +404,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
@@ -411,9 +413,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 b2ca9cf..0772ff2 100644
--- a/src/TinyGsmClientBG96.h
+++ b/src/TinyGsmClientBG96.h
@@ -436,6 +436,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 9afb143..90c534f 100644
--- a/src/TinyGsmClientESP8266.h
+++ b/src/TinyGsmClientESP8266.h
@@ -404,6 +404,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 bc4cd06..eacccbc 100644
--- a/src/TinyGsmClientM590.h
+++ b/src/TinyGsmClientM590.h
@@ -413,6 +413,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/TinyGsmClientM95.h b/src/TinyGsmClientM95.h
index fefab98..c3df0db 100644
--- a/src/TinyGsmClientM95.h
+++ b/src/TinyGsmClientM95.h
@@ -435,6 +435,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/TinyGsmClientMC60.h b/src/TinyGsmClientMC60.h
index 3f3ac04..beff53f 100644
--- a/src/TinyGsmClientMC60.h
+++ b/src/TinyGsmClientMC60.h
@@ -471,6 +471,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 51c475b..963f316 100644
--- a/src/TinyGsmClientSIM800.h
+++ b/src/TinyGsmClientSIM800.h
@@ -483,6 +483,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/TinyGsmClientUBLOX.h b/src/TinyGsmClientUBLOX.h
index 2331738..14e1450 100644
--- a/src/TinyGsmClientUBLOX.h
+++ b/src/TinyGsmClientUBLOX.h
@@ -435,6 +435,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