Added support to WiFi