Move fetcher stuff to report bundle