Some chnages to correct missing things in json