Improve WFS configuration