Workspace WFS service and refactoring