Refactor for consistent and specific fetching