total configuration refactor