Updated with sources mapping