added wfs support