Added more json data, and formatting