Updated WnsClient as per the suggestions.