Updated API fetching