Improve fetch params