Completed conf refactoring.