Fix WSRequest to use WSHandler