Refactored fetching