Tweaks to make parsing standalone from fetching