first, try harder to have an up-to-date sources list.
then, use the mapping whenever applicable and available.