Updated to use NewtonSoft