shadow: improve WDS subsystem