Update the client & server to Return a JSON