WFS improvement