updated ws support