Better anon sessions support. Also for WS