configs refactoring