Update to dynamically fetching