Additional changes for wlan