Improved JSON.NET code for .NET Client