Add support for source fetching