Update WGService to include additional features and filtering