Updated to new data format from API