Added functionalities and removed dependencies from wds