Improve fetch parsing to be extendable