Update to json generator