Configuration extraction now expanded