adapt WFS to new vsession structure