changes to json loader