Changes for WFS