Changes to load data from JSON