WFS related changes