Removed dependency on Newtonsoft.Json