Enhance fetch algorithm