Refactor call to fetch