Add wss
More updates