moved ws to a plugin