Modifications to allow dynamically adding and removing WSs