Added extra extractors