Config, refactoring