configuration controller refactoring