Major changes with json