Revise WDS stuff