Refactor WebServiceRequest