Update the Json to make it more usefull and understandable