cleaned up configuration extension logic