Changes so the JSON reflects adjustments in the other parts