Closing ISSUE #51 WFS-Connector Improvements