Added extraction of source