Small changes to fetchData method