Refactoring fetch