Added wds support
Update TODO