Updates to sourcing logic.