refactored wfs streams