Starting config refactoring