Abstracted out the factory method
Following links in redirects
Quoting in csv report
Removed final uri concept