Improved data fetcher