refactored configuration