Improve Soap client and json client.