Separeted wsdl and endpoint options, Related #4