Updated structs to include latest fields from API