Added wifi management support