Added JSON.NET and made small modifications