Added extract_url_source and extract_url_target