add ws support & remove duplicated requests