Improve wsdl selection