[WIP] - Refactoring fetch