Added support to WLAN text and finalized one2many logic