Adding current data fetching