Improved WFS section