Add ws support
Add ws features