Adjustments to data fetching