Updates to the saving and loading from json logic