Started the switch to JSON