Early changes to support SSID