Made some changes to json structure.