Improve fetch phase