Refactoring needed for merging of pluggable wfs vs wfs-ng