Change Json file and code to use lists instead array