Added json data loading