Fork of WDS plugin