Adjusted process to recent changes in WFS schema