Adding some more trace logging in the client