Added TODOs to fetch