First changes with the JSON stuff