Adding WPA supports