Config refactoring.