Removed dependency on Json.NET